diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/Bundle_ja.properties
index bbd3b03..f54ca01 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_javahelp_packages=JavaHelp
 LBL_qa-functional_test_packages=\u6a5f\u80fd\u30c6\u30b9\u30c8\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/java/hints/errors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/java/hints/errors/Bundle_ja.properties
index 256b019..f5ff232 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/java/hints/errors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/java/hints/errors/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - name of unknown symbol
 FIX_Module_Dependency_Search={0}\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u4f9d\u5b58\u6027\u306e\u691c\u7d22
 FIX_Module_Dependency_UpdatingDependencies=\u4f9d\u5b58\u6027\u306e\u66f4\u65b0
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/queries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/queries/Bundle_ja.properties
index 926af75..8e43ee8 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/queries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/queries/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ModuleProjectClassPathExtender
 # {0} - code name of module
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptyApplication_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptyApplication_ja.html
index b1a9acc..9debdfb 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptyApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptyApplication_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptyModule_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptyModule_ja.html
index 37422e9..f30762e 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptyModule_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptyModule_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptySuite_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptySuite_ja.html
index 9c5346d..f9ef575 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptySuite_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/emptySuite_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/libraryModule_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/libraryModule_ja.html
index 0af2f38..dc53a17 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/libraryModule_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/resources/libraryModule_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/Bundle_ja.properties
index 4c7bf5b..34663af 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_configure_app_name=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u69cb\u6210
 ACTION_arch=\u30a2\u30fc\u30ad\u30c6\u30af\u30c1\u30e3\u306e\u8aac\u660e\u3092\u751f\u6210
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/customizer/Bundle_ja.properties
index 3eb8939..7e8d910 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # general
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/platform/Bundle_ja.properties
index 698fe0f..17e5d7d 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/platform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AddNetbeansPlatformTitle=NetBeans\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u8ffd\u52a0
 CTL_AddPlatform=\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u8ffd\u52a0(&A)...
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/wizard/Bundle_ja.properties
index bbbb14b..165b719 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BasicConfVisualPanel_err_bundle_def_pkg=\u30d0\u30f3\u30c9\u30eb\u7528\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
 BasicConfVisualPanel_err_bundle_empty=\u30d0\u30f3\u30c9\u30eb\u3092\u7a7a\u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/wizard/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/wizard/spi/Bundle_ja.properties
index 7cfa820..848bdac 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/wizard/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/ui/wizard/spi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ChooseRegularSuite=\u901a\u5e38\u306e\u30b9\u30a4\u30fc\u30c8\u3092\u9078\u629e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
 MSG_ChosenPlatformIsInvalid=\u9078\u629e\u3055\u308c\u305f\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u304c\u7121\u52b9\u3067\u3059\u3002\u6709\u52b9\u306a\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3092\u9078\u629e\u3059\u308b\u304b\u3001NetBeans\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30fb\u30de\u30cd\u30fc\u30b8\u30e3\u3067\u7121\u52b9\u306a\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3092\u89e3\u6c7a\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/universe/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/universe/Bundle_ja.properties
index 1e2cbec..d6ca973 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/universe/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-ant/apisupport-ant/org/netbeans/modules/apisupport/project/universe/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 junit_placeholder=Maven\u304b\u3089\u306eJUnit
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-crudsample/apisupport-crudsample/org/netbeans/modules/apisupport/crudsample/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-crudsample/apisupport-crudsample/org/netbeans/modules/apisupport/crudsample/Bundle_ja.properties
index 7f5639b..bd012aa 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-crudsample/apisupport-crudsample/org/netbeans/modules/apisupport/crudsample/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-crudsample/apisupport-crudsample/org/netbeans/modules/apisupport/crudsample/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=CRUD\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30fb\u30b5\u30f3\u30d7\u30eb
 
 LBL_CreateProjectStep=\u65b0\u898fCRUD\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-crudsample/apisupport-crudsample/org/netbeans/modules/apisupport/crudsample/SampleAppDescription_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-crudsample/apisupport-crudsample/org/netbeans/modules/apisupport/crudsample/SampleAppDescription_ja.html
index 992f045..dd6816b 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-crudsample/apisupport-crudsample/org/netbeans/modules/apisupport/crudsample/SampleAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-crudsample/apisupport-crudsample/org/netbeans/modules/apisupport/crudsample/SampleAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-feedreader/apisupport-feedreader/org/netbeans/modules/apisupport/feedreader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-feedreader/apisupport-feedreader/org/netbeans/modules/apisupport/feedreader/Bundle_ja.properties
index 6a77ccf..c375089 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-feedreader/apisupport-feedreader/org/netbeans/modules/apisupport/feedreader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-feedreader/apisupport-feedreader/org/netbeans/modules/apisupport/feedreader/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=NetBeans\u306e\u958b\u767a
 OpenIDE-Module-Long-Description=NetBeans\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u4e0a\u3067\u30d3\u30eb\u30c9\u3055\u308c\u308b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3"FeedReader"\u306e\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4f8b\u3092\u30d0\u30f3\u30c9\u30eb\u3057\u307e\u3059\u30021\u3064\u306e\u6a5f\u80fd\u7684\u306a\u30e2\u30b8\u30e5\u30fc\u30eb\u3068\u3044\u304f\u3064\u304b\u306e\u4ed6\u793e\u88fd\u306e\u30e9\u30a4\u30d6\u30e9\u30ea\u3067\u3001\u5b8c\u5168\u306a\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30b9\u30a4\u30fc\u30c8\u306e\u30c7\u30e2\u3067\u3059\u3002\u8a2d\u5b9a\u3001\u30a6\u30a3\u30f3\u30c9\u30a6\u64cd\u4f5c\u3001\u30a2\u30af\u30b7\u30e7\u30f3\u306a\u3069\u306e\u4f7f\u7528\u65b9\u6cd5\u3092\u793a\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=FeedReader\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30f3\u30d7\u30eb
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-feedreader/apisupport-feedreader/org/netbeans/modules/apisupport/feedreader/FeedReaderDescription_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-feedreader/apisupport-feedreader/org/netbeans/modules/apisupport/feedreader/FeedReaderDescription_ja.html
index 0122e83..3ed151c 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-feedreader/apisupport-feedreader/org/netbeans/modules/apisupport/feedreader/FeedReaderDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-feedreader/apisupport-feedreader/org/netbeans/modules/apisupport/feedreader/FeedReaderDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/Bundle_ja.properties
index dc33215..112c476 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=NetBeans\u306e\u958b\u767a
 OpenIDE-Module-Name=\u30ec\u30ac\u30b7\u30fcMaven NetBeans\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
 OpenIDE-Module-Short-Description=Maven NetBeans\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30d9\u30fc\u30b9\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u7528\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u4f5c\u6210\u3059\u308b\u305f\u3081\u306e\u30e2\u30b8\u30e5\u30fc\u30eb(3.7\u30d7\u30e9\u30b0\u30a4\u30f3\u3088\u308a\u524d)\u3002
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/actions/Bundle_ja.properties
index f9ab5b1..0a8a55f 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_BuildInstallers=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u30d3\u30eb\u30c9
 BuildInstallersAction.NotApp.Warning.Message=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u4f5c\u6210\u3059\u308b\u306b\u306f\u3001\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30b9\u30bf\u30f3\u30c9\u30a2\u30ed\u30f3\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u5207\u66ff\u3048\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\n\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u958b\u304d\u3001\u300c\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u300d\u30d1\u30cd\u30eb\u306b\u5207\u66ff\u3048\u3066\u3001\u30bf\u30a4\u30d7\u3092\u300c\u30b9\u30bf\u30f3\u30c9\u30a2\u30ed\u30f3\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u300d\u306b\u8a2d\u5b9a\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/ui/Bundle_ja.properties
index 999f674..8d8f4b2 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer-maven/apisupport-installer-maven/org/netbeans/modules/apisupport/installer/maven/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_deprecated=\u975e\u63a8\u5968\u306eAnt\u30d9\u30fc\u30b9\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u30fb\u30af\u30ea\u30a8\u30fc\u30bf\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059\u3002\u4fee\u6b63\u3059\u308b\u306b\u306f\u30013.7+\u30d7\u30e9\u30b0\u30a4\u30f3\u306b\u30a2\u30c3\u30d7\u30b0\u30ec\u30fc\u30c9\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 LBL_InstallerPanel=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/Bundle_ja.properties
index 4328753..beba277 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=NetBeans\u306e\u958b\u767a
 OpenIDE-Module-Name=RCP\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
 OpenIDE-Module-Short-Description=NetBeans\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30d9\u30fc\u30b9\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u7528\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u4f5c\u6210\u3059\u308b\u305f\u3081\u306e\u30e2\u30b8\u30e5\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/actions/Bundle_ja.properties
index ccf7088..ced805b 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_BuildInstallers=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
 BuildInstallersAction.NotApp.Warning.Message=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u4f5c\u6210\u3059\u308b\u306b\u306f\u3001\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30b9\u30bf\u30f3\u30c9\u30a2\u30ed\u30f3\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u5207\u66ff\u3048\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\n\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u958b\u304d\u3001\u300c\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u300d\u30d1\u30cd\u30eb\u306b\u5207\u66ff\u3048\u3066\u3001\u30bf\u30a4\u30d7\u3092\u300c\u30b9\u30bf\u30f3\u30c9\u30a2\u30ed\u30f3\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u300d\u306b\u8a2d\u5b9a\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/ui/Bundle_ja.properties
index 737cb85..04ca7cd 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-installer/apisupport-installer/org/netbeans/modules/apisupport/installer/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_InstallerPanel=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-kit/apisupport-kit/org/netbeans/modules/apisupport/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-kit/apisupport-kit/org/netbeans/modules/apisupport/kit/Bundle_ja.properties
index 294f05d..983da53 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-kit/apisupport-kit/org/netbeans/modules/apisupport/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-kit/apisupport-kit/org/netbeans/modules/apisupport/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=NetBeans\u306e\u958b\u767a
 OpenIDE-Module-Long-Description=NetBeans\u306e\u62e1\u5f35\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u958b\u767a\u306b\u5f79\u7acb\u3064\u3001NetBeans\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30bf\u30a4\u30d7\u3092\u5b9a\u7fa9\u3057\u307e\u3059\u3002\u591a\u304f\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u3001\u30b5\u30f3\u30d7\u30eb\u3001\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u3001\u304a\u3088\u3073\u307b\u304b\u306e\u6a5f\u80fd\u3092\u542b\u3093\u3067\u3044\u307e\u3059\u3002\u6700\u65b0\u306e\u5909\u66f4\u3084\u8a73\u7d30\u306f\u300c\u30d8\u30eb\u30d7\u300d\u306e\u300c\u5185\u5bb9\u300d\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 OpenIDE-Module-Name=NetBeans\u30d7\u30e9\u30b0\u30a4\u30f3\u958b\u767a
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/Bundle_ja.properties
index 2c382bc..6c85833 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=NetBeans\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u304a\u3088\u3073OSGi\u30b5\u30f3\u30d7\u30eb
 
 LBL_CreateProjectStep=\u65b0\u898fNetBeans OSGi\u30d9\u30fc\u30b9\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/SampleAppDescription_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/SampleAppDescription_ja.html
index d379157..3d2e632 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/SampleAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/SampleAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/SampleFelixDescription_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/SampleFelixDescription_ja.html
index 5da4b8e..ab3681f 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/SampleFelixDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-osgidemo/apisupport-osgidemo/org/netbeans/modules/apisupport/osgidemo/SampleFelixDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/Bundle_ja.properties
index 8c2ecb4..1c4c509 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_CreateProjectStep=\u65b0\u898f\u30da\u30a4\u30f3\u30c8\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210
 OpenIDE-Module-Display-Category=NetBeans\u306e\u958b\u767a
 OpenIDE-Module-Long-Description=NetBeans\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3092\u4f7f\u7528\u3057\u305f\u30b5\u30f3\u30d7\u30eb\u30fb\u30da\u30a4\u30f3\u30c8\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/PaintAppDescription_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/PaintAppDescription_ja.html
index 9972e2c..02bd2b1 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/PaintAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-paintapp/apisupport-paintapp/org/netbeans/modules/apisupport/paintapp/PaintAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/api/Bundle_ja.properties
index 75bae82..1de5ab1 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_IconInfo=\u9078\u629e\u3057\u305f\u30a2\u30a4\u30b3\u30f3[\u30b5\u30a4\u30ba]:
 OpenIDE-Module-Name=NetBeans\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/layers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/layers/Bundle_ja.properties
index e240952..8c9d1b5 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/layers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/layers/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LayerNode_label=XML\u30ec\u30a4\u30e4\u30fc
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/spi/Bundle_ja.properties
index 3b532d7..c55b044 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/spi/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_splash_window_title_prefix=\u8d77\u52d5\u4e2d
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/branding/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/branding/Bundle_ja.properties
index fdefd16..182fd66 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/branding/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-project/apisupport-project/org/netbeans/modules/apisupport/project/ui/branding/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ResourceBundleKeyPanel.keyValue.text=\u5024
 ResourceBundleKeyPanel.keyName.text=\u30ad\u30fc:
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/hints/Bundle_ja.properties
index 1c35c63..e2d3803 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/hints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ActionRegistrationHinter.missing_org.openide.awt=\u3053\u306e\u4fee\u6b63\u3092\u4f7f\u7528\u3059\u308b\u524d\u306b\u3001org.openide.awt (7.27+)\u3078\u306e\u4f9d\u5b58\u6027\u3092\u8ffd\u52a0\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 avoid_SystemFileSystem.icon32=SystemFileSystem.icon32\u3092\u4f7f\u7528\u3057\u306a\u3044
 both_icon_and_iconBase=SystemFileSystem.icon\u3068iconBase\u306e\u4e21\u65b9\u306e\u5c5e\u6027\u3092\u4f7f\u7528
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/hints/projectbridge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/hints/projectbridge/Bundle_ja.properties
index bd0fdd5..f931c7d 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/hints/projectbridge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/hints/projectbridge/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CAP_Hints=\u30d2\u30f3\u30c8
 LBL_ConfigureInSuite=\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30b9\u30a4\u30fc\u30c8\u3067\u306e\u69cb\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/refactoring/Bundle_ja.properties
index 0f03ace..2f2ce1a 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-refactoring/apisupport-refactoring/org/netbeans/modules/apisupport/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=NetBeans\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
 OpenIDE-Module-Display-Category=NetBeans\u306e\u958b\u767a
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle_ja.properties
index 86e4c88..67898b0 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/Bundle_ja.properties
@@ -1,45 +1,20 @@
 
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ActionWizardTitle=\u30a2\u30af\u30b7\u30e7\u30f3
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction_ja.html
index 6ef5464..b64c2af 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/action/newAction_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle_ja.properties
index 10d8f64..2f37b92 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CodeGeneratorPanel_Title=\u30b3\u30fc\u30c9\u30fb\u30b8\u30a7\u30cd\u30ec\u30fc\u30bf
 Templates/NetBeansModuleDevelopment/newCodeGenerator=\u30b3\u30fc\u30c9\u30fb\u30b8\u30a7\u30cd\u30ec\u30fc\u30bf
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator_ja.html
index a5d9c1a..d83eebb 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/codegenerator/newCodeGenerator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle_ja.properties
index 11be416..2ba1bdf 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Empty=<\u7a7a>
 LBL_InvalidProject=\u7121\u52b9\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/html/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/html/Bundle_ja.properties
index e62bbb0..5076c19 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/html/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/html/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_TCWizardTitle=\u79fb\u690d\u53ef\u80fd\u306aHTML UI
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML_ja.html
index 2cb96c5..a0a14a9 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/html/newHTML_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/Bundle_ja.properties
index 80a979b..1dd879b 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 LBL_JavaHelpWizardTitle=JavaHelp\u30d8\u30eb\u30d7\u30fb\u30bb\u30c3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp_ja.html
index 7412d72..c98c829 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/newJavaHelp_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about_ja.html
index d31ea9d..d708aec 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahelp/template_myplugin-about_ja.html
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <!--">
 <#assign licensePrefix = "">
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahint/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahint/Bundle_ja.properties
index ea057f4..ba0f632 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahint/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahint/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ERR_NoClassName=\u30af\u30e9\u30b9\u540d\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 JavaHintLocationPanel.jLabel1.text=\u30af\u30e9\u30b9\u540d(&C):
 JavaHintDataPanel.jLabel5.text=\u4fee\u6b63\u306e\u8868\u793a\u540d(&F):
 JavaHintDataPanel.jLabel1.text=\u30af\u30e9\u30b9\u540d(&C):
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint_ja.html
index 6dcc455..75413f5 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/javahint/javaHint_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle_ja.properties
index 9792b95..8dd6450 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 already_layer=\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u306f\u3059\u3067\u306bXML\u30ec\u30a4\u30e4\u30fc\u304c\u3042\u308a\u307e\u3059\u3002
 LBL_ProjectName=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8(&P):
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/newLayer_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/newLayer_ja.html
index f09b97d..d225ef3 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/newLayer_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/layer/newLayer_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/Bundle_ja.properties
index 9d8e614..c95f0d1 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #wizard display name
 Templates/NetBeansModuleDevelopment/emptyLibraryDescriptor=Java SE\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/emptyLibraryDescriptor_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/emptyLibraryDescriptor_ja.html
index ff48fd2..2bda884 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/emptyLibraryDescriptor_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/librarydescriptor/emptyLibraryDescriptor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle_ja.properties
index 0b06eb0..90ff274 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 LBL_LoaderWizardTitle=\u30d5\u30a1\u30a4\u30eb\u30fb\u30bf\u30a4\u30d7
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader_ja.html
index 0dac91a..bcea0c0 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/loader/newLoader_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/Bundle_ja.properties
index 072fde4..32682bf 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 LBL_ModuleInstallWizardTitle=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9/\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30bf
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/newModuleInstall_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/newModuleInstall_ja.html
index 98a5a3d..f32a514 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/newModuleInstall_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/moduleinstall/newModuleInstall_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/options/Bundle_ja.properties
index 4e24ef1..55aca0f 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_OptionsWizardTitle=\u30aa\u30d7\u30b7\u30e7\u30f3\u30fb\u30d1\u30cd\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions_ja.html
index 422a7b8..a13f0dd 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/options/newOptions_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/Bundle_ja.properties
index c43695c..7e23845 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_ProjectWizardTitle=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 Templates/NetBeansModuleDevelopment/newProject=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject_ja.html
index b340654..a5583a5 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/newProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription_ja.html
index bda5795..0839c40 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/project/templateDescription_ja.html
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <!--">
 <#assign licensePrefix = "">
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/Bundle_ja.properties
index c389377..6bd5690 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_QuickSearchPanel_Title=\u30af\u30a4\u30c3\u30af\u691c\u7d22\u30d7\u30ed\u30d0\u30a4\u30c0
 Templates/NetBeansModuleDevelopment/newQuickSearch=\u30af\u30a4\u30c3\u30af\u691c\u7d22\u30d7\u30ed\u30d0\u30a4\u30c0
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch_ja.html
index cc054dd..d6589b6 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/quicksearch/newQuickSearch_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/Bundle_ja.properties
index 63502d4..029f3b2 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_NewUpdateCenterWizardTitle=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30fb\u30bb\u30f3\u30bf\u30fc
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter_ja.html
index d9fc0d4..4af9cdf 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/updatecenter/newUpdateCenter_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/Bundle_ja.properties
index 8421b4c..2c4a2ba 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACS_CTL_Layout_CreatedFilesValue=\u4f5c\u6210\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u4e00\u89a7
 ACS_CTL_Layout_ModifiedFilesValue=\u5909\u66f4\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u4e00\u89a7
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout_ja.html
index 53ce0b4..9a5366a 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newLayout_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC_ja.html
index 6ad4e02..adebcf4 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/winsys/newTC_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/Bundle_ja.properties
index 8af1d7a..6523911 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_WizardWizardTitle=\u30a6\u30a3\u30b6\u30fc\u30c9
 
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard_ja.html
index bd48e3c..53700e2 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/newWizard_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription_ja.html
index ba3332f..651efaf 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardDescription_ja.html
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <!--">
 <#assign licensePrefix = "">
diff --git a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML_ja.html b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML_ja.html
index 6345b69..fc870c7 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/apisupport-wizards/apisupport-wizards/org/netbeans/modules/apisupport/project/ui/wizard/wizard/wizardHTML_ja.html
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <!--">
 <#assign licensePrefix = "">
diff --git a/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/Bundle_ja.properties
index dccacbc..fa19889 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_NBM_Reload=\u958b\u767a\u4e2dIDE\u3067\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb/\u518d\u30ed\u30fc\u30c9
 ACT_NBM_Reload_Target=\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u306e\u518d\u30ed\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbAppDescription_ja.html b/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbAppDescription_ja.html
index 55be485..1751a21 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbModuleDescription_ja.html b/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbModuleDescription_ja.html
index 0ffb618..f88a86c 100755
--- a/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbModuleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/apisupport/maven-apisupport/maven-apisupport/org/netbeans/modules/maven/apisupport/NbModuleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/Bundle_ja.properties
index fa0c49f..189ce6b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30b3\u30fc\u30c9\u5206\u6790API\u3002\n\u30d2\u30f3\u30c8\u3068\u30a2\u30ca\u30e9\u30a4\u30b6\u306e\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u304c\u542b\u307e\u308c\u307e\u3059\u3002
 OpenIDE-Module-Name=C/C++\u30b3\u30fc\u30c9\u5206\u6790API
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/options/Bundle_ja.properties
index 7cf4715..fa724fc 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-api/cnd-analysis-api/org/netbeans/modules/cnd/analysis/api/options/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_ShowAs_Label=\u8868\u793a\u5f62\u5f0f(&W):
 CTL_Confidence_Label=\u4fe1\u983c\u5ea6(&C):
 CTL_InTasklist_CheckBox=\u554f\u984c\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u8868\u793a(&P)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-impl/cnd-analysis-impl/org/netbeans/modules/cnd/analysis/impl/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-impl/cnd-analysis-impl/org/netbeans/modules/cnd/analysis/impl/resources/Bundle_ja.properties
index 111d006..7ccfdd8 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-impl/cnd-analysis-impl/org/netbeans/modules/cnd/analysis/impl/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-analysis-impl/cnd-analysis-impl/org/netbeans/modules/cnd/analysis/impl/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30b3\u30fc\u30c9\u5206\u6790\u5b9f\u88c5
 OpenIDE-Module-Name=C/C++\u30b3\u30fc\u30c9\u5206\u6790\u5b9f\u88c5
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-antlr/cnd-antlr/org/netbeans/modules/cnd/antlr/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-antlr/cnd-antlr/org/netbeans/modules/cnd/antlr/Bundle_ja.properties
index f927c7d..40851a8 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-antlr/cnd-antlr/org/netbeans/modules/cnd/antlr/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-antlr/cnd-antlr/org/netbeans/modules/cnd/antlr/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30ebAPI\u5b9f\u88c5\u306b\u3088\u3063\u3066\u4f7f\u7528\u3055\u308c\u3066\u3044\u308b\u30ab\u30b9\u30bf\u30e0ANTLR\u30d1\u30fc\u30b5\u30fc\u30fb\u30b8\u30a7\u30cd\u30ec\u30fc\u30bf\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-api-model/cnd-api-model/org/netbeans/modules/cnd/api/model/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-api-model/cnd-api-model/org/netbeans/modules/cnd/api/model/resources/Bundle_ja.properties
index 02af329..22bbf98 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-api-model/cnd-api-model/org/netbeans/modules/cnd/api/model/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-api-model/cnd-api-model/org/netbeans/modules/cnd/api/model/resources/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30b3\u30fc\u30c9\u3092\u8868\u3059API\u3092\u542b\u3080
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-api-project/cnd-api-project/org/netbeans/modules/cnd/api/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-api-project/cnd-api-project/org/netbeans/modules/cnd/api/project/Bundle_ja.properties
index 956b1cb..7fe3140 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-api-project/cnd-api-project/org/netbeans/modules/cnd/api/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-api-project/cnd-api-project/org/netbeans/modules/cnd/api/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b7\u30b9\u30c6\u30e0\u3068\u53b3\u5bc6\u306b\u306f\u8a8d\u8b58\u3055\u308c\u306a\u3044\u3082\u306e\u306b\u3001C/C++\u30b3\u30fc\u30c9\u652f\u63f4\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002\n\u307b\u304b\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b7\u30b9\u30c6\u30e0(\u305f\u3068\u3048\u3070Symbian)\u304c\u3053\u306e\u30d6\u30ea\u30c3\u30b8\u304b\u3089\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3092\u63d0\u4f9b\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u30b3\u30fc\u30c9\u652f\u63f4\u306f\u540c\u69d8\u306b\u3053\u308c\u3089\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u3082\u52d5\u4f5c\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-api-remote-ui/cnd-api-remote-ui/org/netbeans/modules/cnd/api/remote/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-api-remote-ui/cnd-api-remote-ui/org/netbeans/modules/cnd/api/remote/ui/resources/Bundle_ja.properties
index fdfbb2c..77ad342 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-api-remote-ui/cnd-api-remote-ui/org/netbeans/modules/cnd/api/remote/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-api-remote-ui/cnd-api-remote-ui/org/netbeans/modules/cnd/api/remote/ui/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u30ea\u30e2\u30fc\u30c8\u958b\u767aAPI - Swing
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-api-remote/cnd-api-remote/org/netbeans/modules/cnd/api/remote/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-api-remote/cnd-api-remote/org/netbeans/modules/cnd/api/remote/Bundle_ja.properties
index 1535e17..54f8386 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-api-remote/cnd-api-remote/org/netbeans/modules/cnd/api/remote/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-api-remote/cnd-api-remote/org/netbeans/modules/cnd/api/remote/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u30ea\u30e2\u30fc\u30c8\u306eUNIX\u30db\u30b9\u30c8\u3067C/C++\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u958b\u767a\u3067\u304d\u308bAPI
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-apt/cnd-apt/org/netbeans/modules/cnd/apt/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-apt/cnd-apt/org/netbeans/modules/cnd/apt/Bundle_ja.properties
index 62f5f50..5d59cef 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-apt/cnd-apt/org/netbeans/modules/cnd/apt/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-apt/cnd-apt/org/netbeans/modules/cnd/apt/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5\u30fb\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u3092\u542b\u3080\u30d5\u30a1\u30a4\u30eb\u306eAPT\u8868\u73fe
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/assistance/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/assistance/Bundle_ja.properties
index fd91d9e..2e5e15b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/assistance/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/assistance/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 REG_USAGE_USED=\u4f7f\u7528
 REG_USAGE_ARGUMENT=\u5f15\u6570
 REG_USAGE_RETURNED=\u623b\u308a\u5024
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle_ja.properties
index ec62715..d24e7fb 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_AsmCompileAction=\u30b3\u30f3\u30d1\u30a4\u30eb
 LBL_Asm_loader_name=ASM\u30c7\u30fc\u30bf\u30fb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
 AsmResolver=Asm\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/Bundle_ja.properties
index d4e2aba..64e11b2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u30a2\u30bb\u30f3\u30d6\u30e9\u30fb\u30d5\u30a1\u30a4\u30eb\u306e\u30b5\u30dd\u30fc\u30c8: \u69cb\u6587\u3001\u5f37\u8abf\u8868\u793a\u3001\u30cf\u30a4\u30d1\u30fc\u30ea\u30f3\u30af\u3001\u95a2\u6570\u30ca\u30d3\u30b2\u30fc\u30bf\u306a\u3069
 OpenIDE-Module-Name=C/C++\u30a2\u30bb\u30f3\u30d6\u30e9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/asm-file_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/asm-file_ja.html
index 9713a36..82dead9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/asm-file_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/asm-file_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_ja.html
index 132b428..ad7d24a 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/ui/menu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/ui/menu/Bundle_ja.properties
index 2e6b6ac..5de8824 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/ui/menu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/ui/menu/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_ModelChooser = Asm\u30e2\u30c7\u30eb(&A)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/ui/top/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/ui/top/Bundle_ja.properties
index 213370c..20af1a4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/ui/top/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/ui/top/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_NavigatorAction=\u30ec\u30b8\u30b9\u30bf(&R)
 CTL_NavigatorTopComponent=\u30ec\u30b8\u30b9\u30bf
 HINT_NavigatorTopComponent=\u30ec\u30b8\u30b9\u30bf\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/Bundle_ja.properties
index 4d053e1..f7585ab 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30b3\u30fc\u30eb\u30fb\u30b0\u30e9\u30d5
 OpenIDE-Module-Name=C/C++\u30b3\u30fc\u30eb\u30fb\u30b0\u30e9\u30d5
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/impl/Bundle_ja.properties
index a630040..39380e4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/impl/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_CallGraphAction=\u30b3\u30fc\u30eb\u30fb\u30b0\u30e9\u30d5(&C)
 CTL_CallGraphTopComponent=\u30b3\u30fc\u30eb\u30fb\u30b0\u30e9\u30d5
 HINT_CallGraphTopComponent=\u3053\u308c\u306f\u30b3\u30fc\u30eb\u30fb\u30b0\u30e9\u30d5\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/support/Bundle_ja.properties
index e6c51cb..656ea24 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-callgraph/cnd-callgraph/org/netbeans/modules/cnd/callgraph/support/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 Export=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8(&E)...
 ExportGraph=\u540d\u524d\u3092\u3064\u3051\u3066\u30b0\u30e9\u30d5\u3092\u30a8\u30af\u30b9\u30dd\u30fc\u30c8...
 ExportXmlAction=XML\u3068\u3057\u3066\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/actions/Bundle_ja.properties
index aab4458..8ef0e48 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/actions/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SelectInClasses=\u30af\u30e9\u30b9
 CTL_NavigateSelectInClasses=\u30af\u30e9\u30b9\u3067\u9078\u629e(&C)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/resources/Bundle_ja.properties
index bc5b601..d444445 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-classview/cnd-classview/org/netbeans/modules/cnd/classview/resources/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u30af\u30e9\u30b9\u30fb\u30d3\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/Bundle_ja.properties
index 1cf1aa7..4150e23 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=C/C++ CUnit\u304a\u3088\u3073CppUnit\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Short-Description=CUnit\u304a\u3088\u3073CppUnit\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/editor/filecreation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/editor/filecreation/Bundle_ja.properties
index 8b4efc3..e27fa44 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/editor/filecreation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/editor/filecreation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Loclization for the manifest-editor.mf file.
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/Bundle_ja.properties
index 6b3fcab..d6050ba 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Test Files
 Templates/testFiles=C/C++\u30c6\u30b9\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cppunitrunner_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cppunitrunner_ja.html
index a89ba5f..c3b0312 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cppunitrunner_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cppunitrunner_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cppunittest_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cppunittest_ja.html
index de8fe4f..e619a37 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cppunittest_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cppunittest_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cunittest-c_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cunittest-c_ja.html
index e6db84a..6d2c31c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cunittest-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/cunittest-c_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/test-cppunit_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/test-cppunit_ja.html
index f12ca61..ef5a920 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/test-cppunit_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/test-cppunit_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/test-cunit_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/test-cunit_ja.html
index 4e45237..e4bc2db 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/test-cunit_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/test-cunit_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/testFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/testFiles_ja.html
index 91f75f0..96e7378 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/testFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-cncppunit/cnd-cncppunit/org/netbeans/modules/cnd/cncppunit/resources/testFiles_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_ja.properties
index 9d987e9..415aa54 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2001 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## documentation pane tooltips
 HINT_javadoc_browser_back_button=\u524d\u306e\u30da\u30fc\u30b8\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/ext/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/ext/Bundle_ja.properties
index 5dda67d..46824eb 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/ext/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/ext/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2001 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## code completion strings
 completion-no-suggestions=\u63d0\u6848\u306a\u3057
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle_ja.properties
index a316b00..bb84ec0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PathToCurFile=\u73fe\u5728\u306e\u30d5\u30a1\u30a4\u30eb\u3078\u7d9a\u304f\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u30fb\u30d1\u30b9:
 PathToHeaderOnLine={0}: ({1}\u884c\u76ee)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/doxygensupport/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/doxygensupport/Bundle_ja.properties
index b13e9bd..ffd98ce 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/doxygensupport/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/doxygensupport/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NO_DOC_FOUND=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 MAN_NOT_INSTALLED=\u30de\u30cb\u30e5\u30a2\u30eb\u30fb\u30da\u30fc\u30b8\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u306a\u3044\u3088\u3046\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/impl/xref/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/impl/xref/Bundle_ja.properties
index 156522f..ef57ad1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/impl/xref/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/impl/xref/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 RefSupportDiagnostic.displayName=\u30d5\u30a1\u30a4\u30eb\u306exRef\u306e\u30ad\u30e3\u30c3\u30b7\u30e5
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_ja.properties
index 8e6e7a8..44dd809 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/options/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CodeCompletionPanelName=C/C++
 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)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/resources/Bundle_ja.properties
index 6fe5e6a..0544e0d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 Editors/text/x-c++/Popup/goto/org.netbeans.modules.cnd.completion-cplusplus-CCGoToDeclarationAction.instance=\u5ba3\u8a00/\u5b9a\u7fa9\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/templates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/templates/Bundle_ja.properties
index dfe27a3..bfc1643 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/templates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-completion/cnd-completion/org/netbeans/modules/cnd/completion/templates/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #JavaCodeTemplateProcessor
 CPP-init=\u30b3\u30fc\u30c9\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u521d\u671f\u5316\u4e2d...
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/Bundle_ja.properties
index f69b233..ae2593b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # localization for manifest.mf file 
 OpenIDE-Module-Name=C/C++\u30c7\u30d0\u30c3\u30ac\u5171\u901a
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/capture/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/capture/Bundle_ja.properties
index 9d28e26..b60fe57 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/capture/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/capture/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## CaptureListenAction
 LBL_ListenToCaptures=ss_attach\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u8a31\u53ef
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties
index 916ddb9..be2f9d8 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Dbx=Dbx
 File=\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_ja.properties
index 3a90eec..25ed14d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # OLD #
 # OLD # AttachDialogAction
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_ja.properties
index 2d4c540..85b4339 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/assembly/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 EnvValue=\u5024
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/breakpoints/Bundle_ja.properties
index e45d988..dd7ebfb 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_invalid_field=\u7121\u52b9\u306a\u5024\u30d5\u30a3\u30fc\u30eb\u30c9{1}\u3092\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u539f\u56e0:\n{0}
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/breakpoints/types/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/breakpoints/types/Bundle_ja.properties
index b1061be..9f6839a 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/breakpoints/types/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/breakpoints/types/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_no_set_til_session=\u30c7\u30d0\u30c3\u30ac\u306b\u30d7\u30ed\u30b0\u30e9\u30e0\u304c\u30ed\u30fc\u30c9\u3055\u308c\u308b\u307e\u3067\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u3092\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/io/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/io/Bundle_ja.properties
index aae8004..32b1a60 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/io/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/io/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties
index ebd2c78..8cf396b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ACSD prefix
 #
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/remote/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/remote/Bundle_ja.properties
index 60ff4f4..484fc15 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/remote/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/remote/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # remote debugging support
 REMOTE_DIALOG_TITLE=\u30ea\u30e2\u30fc\u30c8\u30fb\u30db\u30b9\u30c8\u306e\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/Bundle_ja.properties
index 2771a97..1a54f9a 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # OLD #
 # OLD # AttachDialogAction
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/processlist/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/processlist/Bundle_ja.properties
index 04775e5..cdfb641 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/processlist/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/ui/processlist/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 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
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_ja.properties
index f6b53ea..216bc3e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SendComments=\u30b3\u30e1\u30f3\u30c8\u3092\u9001\u4fe1(&D)...
 Comments=\u30b3\u30e1\u30f3\u30c8:
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/masterdetail/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/masterdetail/Bundle_ja.properties
index 4156f5a..19edcf1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/masterdetail/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/masterdetail/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 // OLD DEBUG_BUTTON=Debug
 LOADLISTEDITDIALOG_GUIDANCE_TXT=\u30c7\u30d0\u30c3\u30b0\u30fb\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/options/Bundle_ja.properties
index 76f71e6..bbbcc70 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/utils/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #labels and values for displaying the options
 VALUE_on=\u306f\u3044
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/values/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/values/Bundle_ja.properties
index c50d044..64e7605 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/values/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/values/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Action
 ActionStop=\u505c\u6b62
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_ja.properties
index 200f488..7e99a74 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Gdb=Gdb
 File=\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_ja.properties
index 91677ad..eef6e78 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GdbDebuggerEngine=Gdb\u30c7\u30d0\u30c3\u30ac
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/options/Bundle_ja.properties
index 865d36b..c443a80 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GeneralTxt=\u4e00\u822c
 GeneralHint=\u4e00\u822c
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/resources/Bundle_ja.properties
index 2896ac4..9ff9773 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-debugger-gdb2/cnd-debugger-gdb2/org/netbeans/modules/cnd/debugger/gdb2/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=GNU\u306egdb\u30c7\u30d0\u30c3\u30ac\u306b\u3088\u308b\u57fa\u672c\u30c7\u30d0\u30c3\u30ac\u30fb\u30b5\u30dd\u30fc\u30c8\u3002C/C++ Development Pack\u306b\u542b\u307e\u308c\u3066\u306f\n\u3044\u307e\u3059\u304c\u3001\u3053\u306e\u30c7\u30d0\u30c3\u30ac\u306f\u3001\u9069\u5207\u306a\u30b3\u30f3\u30d1\u30a4\u30e9\u306b\u3088\u3063\u3066\u30b3\u30f3\u30d1\u30a4\u30eb\u3055\u308c\u3001gdb\u304c\u30b5\u30dd\u30fc\u30c8\u3059\u308b\n\u3042\u3089\u3086\u308b\u9ad8\u7d1a\u8a00\u8a9e\u3092\u30c7\u30d0\u30c3\u30b0\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/Bundle_ja.properties
index e710a6d..1ee67a2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u691c\u51faAPI/SPI
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/buildsupport/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/buildsupport/Bundle_ja.properties
index d9030f7..435ae69 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/buildsupport/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/buildsupport/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CANNOT_SAVE_COMPILE_LINES=\u30b3\u30f3\u30d1\u30a4\u30eb\u884c\u306e\u500b\u4eba\u7528\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3"{0}"\u3092\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3002
 CANNOT_REMOVE_COMPILE_LINES=\u30b3\u30f3\u30d1\u30a4\u30eb\u884c\u306e\u500b\u4eba\u7528\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3"{0}"\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/performance/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/performance/Bundle_ja.properties
index a5a27e3..5ed0f35 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/performance/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/performance/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - file
 # {1} - time
 Details.infinite.file.parse=<tr><td>{0}</td><td>{1}</td></tr>\n
@@ -46,43 +63,6 @@
 NotifyProjectProblem.read.message.text=\u9045\u3044\u30d5\u30a1\u30a4\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f
 statistic.action.name.text=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u7d71\u8a08
 statistic.title.text=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u7d71\u8a08
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 StatisticPanel.itemNumberLabel.text=\u9805\u76ee\u306e\u6570
 StatisticPanel.itemWallTimeLabel.text=\u58c1\u6642\u9593(\u30df\u30ea\u79d2)
 StatisticPanel.itemCpuTimeLabel.text=CPU\u6642\u9593(\u30df\u30ea\u79d2)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ja.properties
index 3c02715..4f71ff3 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ConfigureActionName=\u69cb\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/Bundle_ja.properties
index 6d3b343..0700c69 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 WIZARD_TITLE_TXT=\u30b3\u30fc\u30c9\u652f\u63f4\u3092\u69cb\u6210\u30a6\u30a3\u30b6\u30fc\u30c9
 ACTION_TITLE_TXT=\u30b3\u30fc\u30c9\u652f\u63f4\u3092\u69cb\u6210...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/api/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/api/support/Bundle_ja.properties
index 87df204..6fb678a 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/api/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/api/support/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FixInclude.Progress.AnalyzeRoot=\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u30fb\u30d5\u30a1\u30a4\u30eb\u306e\u78ba\u8a8d...
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/support/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/support/impl/Bundle_ja.properties
index 97142c7..4e9cadd 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/support/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/wizard/support/impl/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 UpdateCodeAssistance=\u30b3\u30fc\u30c9\u652f\u63f4\u306e\u66f4\u65b0
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/Bundle_ja.properties
index cea8b2c..028903a 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=Dwarf\u30d9\u30fc\u30b9\u306e\u691c\u51fa\u30d7\u30ed\u30d0\u30a4\u30c0\u306f\u3001C/C++\u30aa\u30d6\u30b8\u30a7\u30af\u30c8/\u30e9\u30a4\u30d6\u30e9\u30ea/\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u30c7\u30d0\u30c3\u30b0\u60c5\u5831\u3092\u691c\u7d22\u3057\u3001\u30e6\u30fc\u30b6\u30fc\u30fb\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u30fb\u30d1\u30b9\u304a\u3088\u3073\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5\u30fb\u30de\u30af\u30ed\u3092\u691c\u51fa\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle_ja.properties
index 02cdf77..1b4ac2f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdiscovery/cnd-dwarfdiscovery/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 Binaries_Provider_Name=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u304a\u3088\u3073\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3092\u89e3\u6790
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdump/cnd-dwarfdump/org/netbeans/modules/cnd/dwarfdump/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdump/cnd-dwarfdump/org/netbeans/modules/cnd/dwarfdump/resources/Bundle_ja.properties
index 65d7692..45378b2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdump/cnd-dwarfdump/org/netbeans/modules/cnd/dwarfdump/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-dwarfdump/cnd-dwarfdump/org/netbeans/modules/cnd/dwarfdump/resources/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=ELF\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30d0\u30c3\u30b0\u30fb\u30bb\u30af\u30b7\u30e7\u30f3\u304b\u3089\u306e\u60c5\u5831\u8aad\u53d6\u308a\u3092\u53ef\u80fd\u306b\u3059\u308b\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/Bundle_ja.properties
index 6f1abd8..91d1b57 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30a8\u30c7\u30a3\u30bf
 OpenIDE-Module-Name=C/C++\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/api/Bundle_ja.properties
index 7ff4976..f33c573 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Language_C=C
 LBL_Language_CPP=C++
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/cplusplus/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/cplusplus/Bundle_ja.properties
index 3c357e2..418592a 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/cplusplus/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/cplusplus/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OPTIONS_CPLUSPLUS=C++\u30a8\u30c7\u30a3\u30bf
 OPTIONS_PLAINC=C\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/folding/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/folding/Bundle_ja.properties
index 8164df6..2152f4e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/folding/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/folding/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Loclization for the manifest-editor.mf file.
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/Bundle_ja.properties
index ea8d751..2b50f05 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OPTIONS_fortran=Fortran\u30a8\u30c7\u30a3\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/options/Bundle_ja.properties
index bb0c5b5..51228f9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Free_Format=\u81ea\u7531\u5f62\u5f0f(&F)
 LBL_AUTO_DETECT=\u5f62\u5f0f\u3092\u81ea\u52d5\u691c\u51fa(&A)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/reformat/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/reformat/Bundle_ja.properties
index 6437c21..083a6c2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/reformat/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/fortran/reformat/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 REFORMATTING_FAILED=\u518d\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u30d5\u30a9\u30fc\u30de\u30c3\u30bf\u304c\u91cd\u8981\u306a\u30b7\u30f3\u30dc\u30eb\u3092\u524a\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059: \n\t\u30c1\u30a7\u30f3\u30b8\u30bb\u30c3\u30c8:"{1}"\u306e"{0}"
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle_ja.properties
index af29915..138fd16 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Tab_Name=\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u30fb\u30b9\u30bf\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/reformat/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/reformat/Bundle_ja.properties
index 6437c21..083a6c2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/reformat/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/reformat/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 REFORMATTING_FAILED=\u518d\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u30d5\u30a9\u30fc\u30de\u30c3\u30bf\u304c\u91cd\u8981\u306a\u30b7\u30f3\u30dc\u30eb\u3092\u524a\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059: \n\t\u30c1\u30a7\u30f3\u30b8\u30bb\u30c3\u30c8:"{1}"\u306e"{0}"
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/Bundle_ja.properties
index 817e318..65d3b57 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 goto = \u79fb\u52d5
 Editors/text/x-c++/Popup/goto=\u30ca\u30d3\u30b2\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/cplusplus/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/cplusplus/Bundle_ja.properties
index ab27076..253b9bf 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/cplusplus/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/cplusplus/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #########################
 # Fonts and Colors
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/fortran/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/fortran/Bundle_ja.properties
index 50e2ed8..42fd4fc 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/fortran/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-editor/cnd-editor/org/netbeans/modules/cnd/editor/resources/fortran/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #########################
 # Fonts and Colors
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/resources/Bundle_ja.properties
index 77a23ef..2671b20 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Display-Category=C/C++
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/symbol/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/symbol/Bundle_ja.properties
index abecfc1..114b6d0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/symbol/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/symbol/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CPP_Provider_Display_Name=C/C++
 CPP_Descriptor_In_Compound={1}\u4e2d\u306e{0}
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/type/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/type/Bundle_ja.properties
index ca4188e..72359db 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/type/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-gotodeclaration/cnd-gotodeclaration/org/netbeans/modules/cnd/gotodeclaration/type/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 TYPE_PROVIDER_DISPLAY_NAME="C/C++\u30af\u30e9\u30b9"
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/Bundle_ja.properties
index c2e6184..0bd0750 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CndTodoTasks=C/C++ TODO
 CndTodoTasksDesc=C/C++\u306eTODO
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle_ja.properties
index cc914d8..d104d91 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LABL_CppParserAnnotationError=C/C++\u30d1\u30fc\u30b5\u30fc\u30fb\u30a8\u30e9\u30fc
 HighlightProvider_HyperlinkActionsHints={0}\n\u8ffd\u52a0\u60c5\u5831\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u3001{1}\u3092\u30db\u30fc\u30eb\u30c9\u3057\u3066\u3001\u30de\u30a6\u30b9\u3092\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u30fb\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u306e\u4e0a\u306b\u52d5\u304b\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/includes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/includes/Bundle_ja.properties
index 6111319..d34b2ae 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/includes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/error/includes/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ErrorIncludeDialog_Title=#include/#error\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u3067\u5931\u6557
 ErrorIncludeDialog_AccessibleName=\u5931\u6557\u3057\u305f\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5\u30fb\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u3092\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/hints/Bundle_ja.properties
index 6cee9c9..2162494 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/hints/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 General_NAME=\u4e00\u822c
 General_DESCRIPTION=\u4e00\u822c\u7684\u306aC/C++\u30d2\u30f3\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/hints/formatstring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/hints/formatstring/Bundle_ja.properties
index 6869446..d5df295 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/hints/formatstring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/hints/formatstring/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #FormatStringAudit
 FormatStringAudit.name=\u7121\u52b9\u306a\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u6587\u5b57\u5217
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/resources/Bundle_ja.properties
index 6766942..347f85f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/resources/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u8a00\u8a9e\u7528::\n- \u30a8\u30e9\u30fc\u306e\u5f37\u8abf\u8868\u793a\u3002\u73fe\u6642\u70b9\u3067\u306f\u3001#include\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5\u30fb\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u306b\u95a2\u3059\u308b\u30a8\u30e9\u30fc\u306e\u5f37\u8abf\u8868\u793a\u306e\u307f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u3059\u3002\n- \u30bb\u30de\u30f3\u30c6\u30a3\u30af\u306e\u5f37\u8abf\u8868\u793a\u3002\u73fe\u6642\u70b9\u3067\u306f\u3001ifdef\u306e\u3088\u3046\u306a\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u306b\u3042\u308b\u30a2\u30af\u30c6\u30a3\u30d6\u3067\u306a\u3044\u30b3\u30fc\u30c9\u306e\u30b0\u30ec\u30fc\u8868\u793a\u306e\u307f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/security/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/security/Bundle_ja.properties
index 44f36ed..57dfb23 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/security/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/security/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LAB_security_error=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fb\u30a8\u30e9\u30fc
 LAB_security_warning=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u8b66\u544a
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_ja.properties
index 954bea0..ae538cf 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CppParserMarkOccurrencesAnnotation=\u51fa\u73fe\u7b87\u6240\u3092\u30de\u30fc\u30af
 LABL_CppMarkOccurrencesAnnotation=C/C++\u30a8\u30c7\u30a3\u30bf\u306e\u51fa\u73fe\u7b87\u6240\u3092\u30de\u30fc\u30af
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/actions/Bundle_ja.properties
index e8f0063..cc859cf 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 next-marked-occurrence=\u6b21\u306e\u51fa\u73fe\u306b\u30ca\u30d3\u30b2\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/options/Bundle_ja.properties
index dd3488f..2e48e8c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-highlight/cnd-highlight/org/netbeans/modules/cnd/highlight/semantic/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TAB_SemanticHighlightingTab=\u5f37\u8abf\u8868\u793a
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-indexing/cnd-indexing/org/netbeans/modules/cnd/indexing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-indexing/cnd-indexing/org/netbeans/modules/cnd/indexing/Bundle_ja.properties
index d60ae35..3ec8d47 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-indexing/cnd-indexing/org/netbeans/modules/cnd/indexing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-indexing/cnd-indexing/org/netbeans/modules/cnd/indexing/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u306e\u7d22\u5f15\u4ed8\u3051
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-kit/cnd-kit/org/netbeans/modules/cnd/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-kit/cnd-kit/org/netbeans/modules/cnd/kit/Bundle_ja.properties
index 81ec3df..fbe2e22 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-kit/cnd-kit/org/netbeans/modules/cnd/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-kit/cnd-kit/org/netbeans/modules/cnd/kit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u7de8\u96c6\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3001GDB\u30c7\u30d0\u30c3\u30ac\u3001\u304a\u3088\u3073make\u3092\u542b\u3080C/C++\u30b5\u30dd\u30fc\u30c8\u3002Fortran\u304a\u3088\u3073\u30a2\u30bb\u30f3\u30d6\u30e9(x86/64\u3001SPARC)\u306e\u57fa\u672c\u30b5\u30dd\u30fc\u30c8\u304c\u3042\u308a\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-lexer/cnd-lexer/org/netbeans/modules/cnd/lexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-lexer/cnd-lexer/org/netbeans/modules/cnd/lexer/Bundle_ja.properties
index 7eecc66..af739e9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-lexer/cnd-lexer/org/netbeans/modules/cnd/lexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-lexer/cnd-lexer/org/netbeans/modules/cnd/lexer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=C/C++\u30ec\u30af\u30b5\u30fc
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-source-bridge/cnd-makeproject-source-bridge/org/netbeans/modules/cnd/makeproject/source/bridge/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-source-bridge/cnd-makeproject-source-bridge/org/netbeans/modules/cnd/makeproject/source/bridge/resources/Bundle_ja.properties
index 16f476f..5d21a6b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-source-bridge/cnd-makeproject-source-bridge/org/netbeans/modules/cnd/makeproject/source/bridge/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-source-bridge/cnd-makeproject-source-bridge/org/netbeans/modules/cnd/makeproject/source/bridge/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 # Should not be translated
 OpenIDE-Module-Long-Description=MakeProject\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u57fa\u3065\u3044\u3066C/C++\u30a8\u30c7\u30a3\u30bf\u7528\u306e\u7279\u5225\u306a\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u63d0\u4f9b\u3059\u308b\u30d6\u30ea\u30c3\u30b8\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/api/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/api/ui/actions/Bundle_ja.properties
index dd315d2..4f491a8 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/api/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/api/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Add Existing Item Action
 CTL_AddExistingItemAction=\u65e2\u5b58\u306e\u9805\u76ee\u306e\u8ffd\u52a0...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/Bundle_ja.properties
index 1e4f0cc..0acec57 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # AddExternalItemAction
 CTL_AddExternalItem=\u91cd\u8981\u306a\u30d5\u30a1\u30a4\u30eb\u306b\u9805\u76ee\u3092\u8ffd\u52a0...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/actions/Bundle_ja.properties
index 04ac5f3..e1d785d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_MoreBuildActionsAction_Name=\u305d\u306e\u4ed6\u306e\u30d3\u30eb\u30c9\u30fb\u30b3\u30de\u30f3\u30c9
 LBL_ManageLaunchersAction_Name=\u8d77\u52d5\u30c4\u30fc\u30eb\u306e\u7ba1\u7406...
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/configurations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/configurations/Bundle_ja.properties
index e795772..22f731e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/configurations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/configurations/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle_ja.properties
index 0b74c4d..8fca7d2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Configuration node labels
 PROJECT_PROPERTIES=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/dialogs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/dialogs/Bundle_ja.properties
index 5e80d42..d270b36 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/dialogs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/dialogs/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #ConfirmExtensionsImpl
 ConfirmExtensions.dialog.title=\u65b0\u898f\u62e1\u5f35\u5b50
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_ja.properties
index 59ae68f..d7f31c8 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/launchers/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Launchers_Title=\u8d77\u52d5\u30c4\u30fc\u30eb
 LaunchersPanel.launchersListLabel.text=\u8d77\u52d5\u30c4\u30fc\u30eb\u30fb\u30ea\u30b9\u30c8(&S)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_ja.properties
index 39ee1e2..f5fb277 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # MakeProjectEditorOptions
 MakeProject_Editor=C/C++\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/Bundle_ja.properties
index b21d2d7..c137479 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++ Make Projects - Swing
 OpenIDE-Module-Short-Description=C/C++\u30d7\u30ed\u30b8\u30a7\u30af\u30c8UI\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/binary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/binary_ja.html
index 5673ea2..311c572 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/binary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/binary_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/desktop_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/desktop_ja.html
index 79d9cc2..c4aac6f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/desktop_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/makefile_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/makefile_ja.html
index 173a669..8fbc483 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/makefile_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/makefile_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication_ja.html
index e8b72b6..0b74616 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary_ja.html
index ffd42f3..6b9dda7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newFullRemote_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newFullRemote_ja.html
index 321a9ef..465ab70 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newFullRemote_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newFullRemote_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtApplication_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtApplication_ja.html
index 7364ecd..4e5cde5 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtApplication_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtDynamicLibrary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtDynamicLibrary_ja.html
index def58ae..989ee23 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtDynamicLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtDynamicLibrary_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtStaticLibrary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtStaticLibrary_ja.html
index 12eff0b..a02ff34 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtStaticLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newQtStaticLibrary_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary_ja.html
index 7a76e10..a1c63b4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/runprofiles/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/runprofiles/Bundle_ja.properties
index 34dfd5a..bebe6d9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/runprofiles/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/runprofiles/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # General Panel
 LBL_Config_General=\u4e00\u822c
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle_ja.properties
index 2213638..8819c59 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #PathPanel
 PATHPANEL_PATHLABEL_TXT=\u30d1\u30b9\u306e\u683c\u7d0d\u65b9\u6cd5:
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties
index 98ab311..d0cc605 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject-ui/cnd-makeproject-ui/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # BuildActionsPanel
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/Bundle_ja.properties
index 4660347..fcf8b77 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Module Description
 OpenIDE-Module-Name=C/C++ Make Projects
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/actions/Bundle_ja.properties
index 2399436..1197f3f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Add Existing Item Action
 CTL_AddExistingItemAction=\u65e2\u5b58\u306e\u9805\u76ee\u306e\u8ffd\u52a0...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_ja.properties
index 85841aa..0a4b2e5 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ProjectActionEvent
 BuildActionName=\u30d3\u30eb\u30c9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/actions/Bundle_ja.properties
index dd315d2..4f491a8 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Add Existing Item Action
 CTL_AddExistingItemAction=\u65e2\u5b58\u306e\u9805\u76ee\u306e\u8ffd\u52a0...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_ja.properties
index d356902..27fda0e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Basic Compiler Configuration development modes
 FastBuildTxt=\u30d5\u30e9\u30b0\u306a\u3057
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/launchers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/launchers/Bundle_ja.properties
index 80825b6..7edaef5 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/launchers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/launchers/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 illegal.string=\u30d5\u30a1\u30a4\u30eb{0}\u5185\u306e\u7121\u52b9\u306a\u6587\u5b57\u5217\u3002\n{1}
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/runprofiles/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/runprofiles/Bundle_ja.properties
index 0c1ae5e..0087f31 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/runprofiles/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/api/runprofiles/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #RunProfile Console types
 ConsoleType_Default=\u30c7\u30d5\u30a9\u30eb\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/Bundle_ja.properties
index eb5169a..f5276a0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CANTREADDESCRIPTOR={0}\u306e\u69cb\u6210\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u306e\u8aad\u53d6\u308a\u30a8\u30e9\u30fc\u3002
 OLD_VERSION_WARNING={0}\u306f\u4ee5\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306eIDE\u3067\u4f5c\u6210\u3055\u308c\u3066\u3044\u3066\u3001\u5c06\u6765\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3067\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u306a\u304f\u306a\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\n\n\u73fe\u5728\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u5909\u63db\u3057\u307e\u3059\u304b?
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/ui/Bundle_ja.properties
index 5d5b11b..db8ff01 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/configurations/ui/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/execution/Bundle_ja.properties
index 4ac405b..47d6365 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/execution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ResolveBuildLibrary.Title.text=\u30d3\u30eb\u30c9\u306e\u554f\u984c\u306e\u89e3\u6c7a
 ResolveBuildLibrary.Explanation.text=IDE\u306f\u30b9\u30de\u30fc\u30c8\u30fb\u30d3\u30eb\u30c9\u30fb\u30a2\u30ca\u30e9\u30a4\u30b6\u3092\u4f7f\u7528\u3057\u3066\u3001\u30b3\u30fc\u30c9\u652f\u63f4\u3092\u69cb\u6210\u3057\u307e\u3059\u3002\n\u30d3\u30eb\u30c9\u3067LD_LIBRARY_PATH\u74b0\u5883\u5909\u6570\u3092\u30ea\u30bb\u30c3\u30c8\u307e\u305f\u306f\u8a2d\u5b9a\u89e3\u9664\u3059\u308b\u3053\u3068\u306b\u3088\u3063\u3066\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002\n\n\u554f\u984c\u3092\u89e3\u6c7a\u3059\u308b\u305f\u3081\u3001\u6b21\u306e\u3044\u305a\u308c\u304b\u3092\u5b9f\u884c\u3067\u304d\u307e\u3059(\u512a\u5148\u5ea6\u304c\u9ad8\u3044\u9806\u306b\u4e26\u3079\u3089\u308c\u3066\u3044\u307e\u3059):\n\n1. \u30d3\u30eb\u30c9\u3067LD_LIBRARY_PATH\u3092\u8a2d\u5b9a\u89e3\u9664\u3057\u306a\u3044\u304b\u3001LD_LIBRARY_PATH=user_path1:user_path2:$LD_LIBRARY_PATH\u306e\u3088\u3046\u306b\u5909\u66f4\u3057\u307e\u3059\u3002\n\n2. \u30d3\u30eb\u30c9\u3067LD_LIBRARY_PATH\u304c\u8a2d\u5b9a\u89e3\u9664\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u3001LD_PRELOAD\u3092\u8a2d\u5b9a\u89e3\u9664\u3057\u307e\u3059\u3002\u3053\u308c\u306b\u3088\u308a\u3001\u30b9\u30de\u30fc\u30c8\u30fb\u30d3\u30eb\u30c9\u30fb\u30a2\u30ca\u30e9\u30a4\u30b6\u304c\u7121\u52b9\u306b\u306a\u308b\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\n3. \u4e0b\u306e\u300c\u30b9\u30de\u30fc\u30c8\u30fb\u30d3\u30eb\u30c9\u30fb\u30a2\u30ca\u30e9\u30a4\u30b6\u3092\u69cb\u6210\u300d\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u3001\u300c\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3\u300d\u306e\u300c\u30b3\u30fc\u30c9\u652f\u63f4\u300d\u30ce\u30fc\u30c9\u3067\u300c\u30d3\u30eb\u30c9\u30fb\u30a2\u30ca\u30e9\u30a4\u30b6\u3092\u4f7f\u7528\u300d\u3092\u9078\u629e\u89e3\u9664\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/launchers/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/launchers/actions/Bundle_ja.properties
index 4933989..07d2b96 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/launchers/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/launchers/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_BuildAsAction_Name=\u30d3\u30eb\u30c9
 LBL_RunAsAction_Name=\u5b9f\u884c
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/options/Bundle_ja.properties
index bd70636..c5fab8b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DEPENDENCY_CHECKBOX_AD=\u751f\u6210\u3057\u305fMakefile\u3067\u306e\u4f9d\u5b58\u6027\u30c1\u30a7\u30c3\u30af\u3092\u6709\u52b9\u5316(\u30c4\u30fc\u30eb\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u306e\u30b5\u30dd\u30fc\u30c8\u304c\u5fc5\u8981)
 DEPENDENCY_CHECKING_TXT=\u751f\u6210\u3057\u305fMakefile\u3067\u306e\u4f9d\u5b58\u6027\u30c1\u30a7\u30c3\u30af\u3092\u6709\u52b9\u5316(\u30c4\u30fc\u30eb\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u306e\u30b5\u30dd\u30fc\u30c8\u304c\u5fc5\u8981)(&Y)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/packaging/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/packaging/Bundle_ja.properties
index 8b81f1d..eecefe4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/packaging/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/packaging/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SCR4Package=Solaris SVR4\u30d1\u30c3\u30b1\u30fc\u30b8
 IPSPackage=IPS\u30d1\u30c3\u30b1\u30fc\u30b8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_ja.properties
index 830e088..ad5cac2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GenericName=\u6c4e\u7528
 NoPlatform=\u4e0d\u660e
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/args_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/args_ja.html
index 49af4ee..311f022 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/args_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/args_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/fractal_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/fractal_ja.html
index 69a6d72..9051be9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/fractal_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/fractal_ja.html
@@ -1,42 +1,23 @@
  <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
- -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/freeway_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/freeway_ja.html
index 32d1fb7..6118b11 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/freeway_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/freeway_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/hello_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/hello_ja.html
index 68b7830..b2c936e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/hello_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/hello_ja.html
@@ -1,42 +1,23 @@
  <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
- -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/helloapp_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/helloapp_ja.html
index 14f3c6a..126100a 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/helloapp_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/helloapp_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/hellocmake_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/hellocmake_ja.html
index 00f4373..6565474 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/hellocmake_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/hellocmake_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/helloqt_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/helloqt_ja.html
index 327e640..ce24751 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/helloqt_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/helloqt_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/io_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/io_ja.html
index d15e565..3bebe64 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/io_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/io_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/lexyacc_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/lexyacc_ja.html
index b1147d2..651cb16 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/lexyacc_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/lexyacc_ja.html
@@ -1,42 +1,23 @@
  <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
- -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/mp_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/mp_ja.html
index 2e987e7..3e5fded 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/mp_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/mp_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/pi_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/pi_ja.html
index ca2b315..581838c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/pi_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/pi_ja.html
@@ -1,42 +1,23 @@
  <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
- -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/quote_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/quote_ja.html
index 7668aa3..afb62ff 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/quote_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/quote_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/welcome_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/welcome_ja.html
index bc4a91f..faf9209 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/welcome_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/resources/samples/welcome_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/runprofiles/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/runprofiles/Bundle_ja.properties
index 8fee1c6..3f5a24b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/runprofiles/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/runprofiles/Bundle_ja.properties
@@ -1,43 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 RUNNING=\u5b9f\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/runprofiles/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/runprofiles/ui/Bundle_ja.properties
index 0711cf7..493106f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/runprofiles/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/runprofiles/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # General Panel
 LBL_Config_General=\u4e00\u822c
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/Bundle_ja.properties
index 63ace87..98e377b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # AddExternalItemAction
 CTL_AddExternalItem=\u91cd\u8981\u306a\u30d5\u30a1\u30a4\u30eb\u306b\u9805\u76ee\u3092\u8ffd\u52a0...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/actions/Bundle_ja.properties
index bb80c76..b253e16 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/actions/Bundle_ja.properties
@@ -1,41 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_MoreBuildActionsAction_Name=\u305d\u306e\u4ed6\u306e\u30d3\u30eb\u30c9\u30fb\u30b3\u30de\u30f3\u30c9
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle_ja.properties
index 7d65175..73673a8 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Configuration node labels
 PROJECT_PROPERTIES=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_ja.properties
index 39ee1e2..f5fb277 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # MakeProjectEditorOptions
 MakeProject_Editor=C/C++\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/binary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/binary_ja.html
index db642c0..311c572 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/binary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/binary_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/desktop_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/desktop_ja.html
index c363e01..c4aac6f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/desktop_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/makefile_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/makefile_ja.html
index 05b42ea..8fbc483 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/makefile_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/makefile_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication_ja.html
index a15be7d..0b74616 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newApplication_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary_ja.html
index b1a4641..6b9dda7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newDynamicLibrary_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newFullRemote_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newFullRemote_ja.html
index c2c99f1..465ab70 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newFullRemote_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newFullRemote_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtApplication_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtApplication_ja.html
index 746e913..4e5cde5 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtApplication_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2008 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtDynamicLibrary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtDynamicLibrary_ja.html
index d25aca6..989ee23 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtDynamicLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtDynamicLibrary_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2008 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtStaticLibrary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtStaticLibrary_ja.html
index 0f8ca2d..a02ff34 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtStaticLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newQtStaticLibrary_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2008 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary_ja.html
index a712066..a1c63b4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/newStaticLibrary_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/args_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/args_ja.html
index 09aa4b1..311f022 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/args_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/args_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ja.html
index 016c076..b4fb962 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/fractal_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/freeway_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/freeway_ja.html
index b3e615f..6118b11 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/freeway_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/freeway_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-   -
-   - Copyright 1997-2008 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ja.html
index dc78d46..949c7b0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hello_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloapp_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloapp_ja.html
index 9f6bec3..126100a 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloapp_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloapp_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hellocmake_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hellocmake_ja.html
index 32eadfd..6565474 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hellocmake_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/hellocmake_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloqt_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloqt_ja.html
index d6138d6..ce24751 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloqt_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/helloqt_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2009 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/io_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/io_ja.html
index 001ec1d..3bebe64 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/io_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/io_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ja.html
index bc26e06..ea13e10 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/lexyacc_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/mp_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/mp_ja.html
index 9abec2e..3e5fded 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/mp_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/mp_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html
index ff385d3..b642d8c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/quote_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/quote_ja.html
index 3c7ca55..afb62ff 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/quote_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/quote_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/welcome_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/welcome_ja.html
index 7dcb5f8..faf9209 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/welcome_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/welcome_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle_ja.properties
index d476e0d..df98af1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/utils/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #PathPanel
 PATHPANEL_PATHLABEL_TXT=\u30d1\u30b9\u306e\u683c\u7d0d\u65b9\u6cd5:
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties
index 4d8b018..9cb7e91 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # BuildActionsPanel
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-model-jclank-bridge/cnd-model-jclank-bridge/org/netbeans/modules/cnd/model/jclank/bridge/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-model-jclank-bridge/cnd-model-jclank-bridge/org/netbeans/modules/cnd/model/jclank/bridge/resources/Bundle_ja.properties
index 543663c..3cc3908 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-model-jclank-bridge/cnd-model-jclank-bridge/org/netbeans/modules/cnd/model/jclank/bridge/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-model-jclank-bridge/cnd-model-jclank-bridge/org/netbeans/modules/cnd/model/jclank/bridge/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=JClank\u304a\u3088\u3073\u53e4\u3044\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30eb\u30fb\u30d6\u30ea\u30c3\u30b8
 OpenIDE-Module-Name=C/C++ JClank\u304a\u3088\u3073\u53e4\u3044\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30eb\u30fb\u30d6\u30ea\u30c3\u30b8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-model-jclank-bridge/cnd-model-jclank-bridge/org/netbeans/modules/cnd/model/jclank/bridge/trace/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-model-jclank-bridge/cnd-model-jclank-bridge/org/netbeans/modules/cnd/model/jclank/bridge/trace/Bundle_ja.properties
index 7047c3c..9103911 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-model-jclank-bridge/cnd-model-jclank-bridge/org/netbeans/modules/cnd/model/jclank/bridge/trace/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-model-jclank-bridge/cnd-model-jclank-bridge/org/netbeans/modules/cnd/model/jclank/bridge/trace/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_JClankTraceCompilationDBAction=JClank\u306e\u30c8\u30ec\u30fc\u30b9\u30fb\u30b3\u30f3\u30d1\u30a4\u30ebDB
 CTL_JClankTracePreprocessorAction=JClank\u3092\u4f7f\u7528\u3057\u305f\u524d\u51e6\u7406
 JClankOnlyExpandTokensWithStatistics.displayName=\u62e1\u5f35\u306e\u307f + \u7d71\u8a08
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-model-services/cnd-model-services/org/netbeans/modules/cnd/model/services/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-model-services/cnd-model-services/org/netbeans/modules/cnd/model/services/Bundle_ja.properties
index ac7ed68..425631d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-model-services/cnd-model-services/org/netbeans/modules/cnd/model/services/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-model-services/cnd-model-services/org/netbeans/modules/cnd/model/services/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30ebAPI\u3068\u9023\u643a\u3059\u308b\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modeldiscovery/cnd-modeldiscovery/org/netbeans/modules/cnd/modeldiscovery/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modeldiscovery/cnd-modeldiscovery/org/netbeans/modules/cnd/modeldiscovery/Bundle_ja.properties
index 502edf3..30439e7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modeldiscovery/cnd-modeldiscovery/org/netbeans/modules/cnd/modeldiscovery/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modeldiscovery/cnd-modeldiscovery/org/netbeans/modules/cnd/modeldiscovery/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u30e2\u30c7\u30eb\u30d9\u30fc\u30b9\u306e\u691c\u51fa\u30d7\u30ed\u30d0\u30a4\u30c0\u306f\u672a\u89e3\u6c7a\u306e\u30d8\u30c3\u30c0\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22\u3057\u3001\u4e0d\u660e\u306e\u30e6\u30fc\u30b6\u30fc\u30fb\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u30fb\u30d1\u30b9\u3092\u691c\u51fa\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modeldiscovery/cnd-modeldiscovery/org/netbeans/modules/cnd/modeldiscovery/provider/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modeldiscovery/cnd-modeldiscovery/org/netbeans/modules/cnd/modeldiscovery/provider/Bundle_ja.properties
index 082869f..0b7e84b0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modeldiscovery/cnd-modeldiscovery/org/netbeans/modules/cnd/modeldiscovery/provider/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modeldiscovery/cnd-modeldiscovery/org/netbeans/modules/cnd/modeldiscovery/provider/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # analyze object files in folder
 Model_Provider_Name=\u30d5\u30a1\u30a4\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0\u304b\u3089C/C++\u30d8\u30c3\u30c0\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/Bundle_ja.properties
index 81ea758..68dc98b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/Bundle_ja.properties
@@ -1,41 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CLOSE_PROJECT_DIALOG_MESSAGE=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u9589\u3058\u3066\u3044\u307e\u3059...
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/parser/clank/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/parser/clank/Bundle_ja.properties
index 81c8042..5c93359 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/parser/clank/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/parser/clank/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Debug strings, NOI18N
 NULL_PATH=\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6"{0}"\u306e\u672a\u89e3\u6c7a\u306e\u30d1\u30b9\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/platform/Bundle_ja.properties
index a734c16..9fe743d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/platform/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ParsingProgress={0}\u306e\u69cb\u6587\u89e3\u6790\u4e2d...
 MSG_CodeAssistanceInitializationTask={0}\u306e\u30b3\u30fc\u30c9\u652f\u63f4\u3092\u521d\u671f\u5316\u3057\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/resources/Bundle_ja.properties
index 4fe3c9d..82eedcd 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/resources/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30eb\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30ebAPI\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u3042\u308b\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3092\u5b9f\u88c5\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/syntaxerr/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/syntaxerr/Bundle_ja.properties
index 52e57a2..e0a8640 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/syntaxerr/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/syntaxerr/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_MISSED_SEMICOLON="\u30bb\u30df\u30b3\u30ed\u30f3 (;) \u304c\u3042\u308a\u307e\u305b\u3093"
 MSG_UNEXPECTED_TOKEN=\u4e88\u671f\u3057\u306a\u3044\u30c8\u30fc\u30af\u30f3: {0}
 MSG_PARSER_ERROR=\u4e0d\u660e\u306a\u30d1\u30fc\u30b5\u30fc\u30fb\u30a8\u30e9\u30fc
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/trace/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/trace/Bundle_ja.properties
index f36ad95..13389dd 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/trace/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/trace/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 FileImplASTTrace.displayName=\u30d5\u30a1\u30a4\u30ebAST
 FileImplModelTrace.displayName=\u30d5\u30a1\u30a4\u30eb\u30fb\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30eb
 FileTrace.displayName=\u4e00\u822c\u30d5\u30a1\u30a4\u30eb\u60c5\u5831
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/Bundle_ja.properties
index a8add49..8a4da66 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30ebAPI\u5b9f\u88c5\u306b\u95a2\u4fc2\u3059\u308bUI\u3092\u542b\u307f\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_ja.properties
index ac58c58..8e61fe3 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/actions/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 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
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/parsing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/parsing/Bundle_ja.properties
index b5d22d8..3153cba 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/parsing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/parsing/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_LowMemory=\u30e1\u30e2\u30ea\u30fc\u4e0d\u8db3
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/switcher/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/switcher/Bundle_ja.properties
index e3943ae..a7cbbd3 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/switcher/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/switcher/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SwitcherDialogAction=C/C++\u30b3\u30fc\u30c9\u652f\u63f4
 CTL_SwitchProjectAction=C/C++\u30b3\u30fc\u30c9\u652f\u63f4
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/trace/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/trace/Bundle_ja.properties
index 37f526e..be9061b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/trace/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelui/cnd-modelui/org/netbeans/modules/cnd/modelui/trace/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_TestProjectReferencesAction=\u89e3\u6c7a\u4e2d: \u3059\u3079\u3066\u306e\u53c2\u7167\u3092\u8a66\u9a13
 CTL_TestProjectReferencesPerformanceAction=\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9: \u3059\u3079\u3066\u306e\u53c2\u7167\u3092\u8a66\u9a13...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/Bundle_ja.properties
index 90e08fa..973d716 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_ITEM_TOOLTIP=<html><body><b>{0}</b>
 MSG_ITEM_TOOLTIP2=<html><body>{1}\u5185\u306e<b>{0}</b>
 DISPLAY_TEXT_SYS_MACRO=\u6b21\u306e\u5024\u306e\u30b7\u30b9\u30c6\u30e0\u30fb\u30de\u30af\u30ed:<br>{0}
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_ja.properties
index 2414e6f..eed9c3d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-modelutil/cnd-modelutil/org/netbeans/modules/cnd/modelutil/resources/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u307b\u304b\u306eC/C++\u30b3\u30fc\u30c9\u30fb\u30e2\u30c7\u30eb\u30fb\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306b\u3088\u3063\u3066\u4f7f\u7528\u3055\u308c\u308b\u305d\u306e\u4ed6\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fb\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/callgraph/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/callgraph/Bundle_ja.properties
index 8877826..becac2c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/callgraph/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/callgraph/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_inClass=\u5185
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/classhierarchy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/classhierarchy/Bundle_ja.properties
index ebef6d5..0dc08bb 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/classhierarchy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/classhierarchy/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ClassHierarchyTopComponent=C++\u30bf\u30a4\u30d7\u306e\u968e\u5c64
 HINT_ClassHierarchyTopComponent=C++\u30bf\u30a4\u30d7\u306e\u968e\u5c64\u30d3\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/docview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/docview/Bundle_ja.properties
index 9403d3b..c0a9582 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/docview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/docview/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_DocViewTopComponent=C/C++\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
 CTL_ShowDocViewAction=C/C++\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8(&C)
 HINT_DocViewTopComponent=C/C++\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u306f\u3001\u30ad\u30e3\u30ec\u30c3\u30c8\u4e0b\u306e\u8981\u7d20\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/hierarchy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/hierarchy/Bundle_ja.properties
index f397c4c..ab3b0c9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/hierarchy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/hierarchy/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_HierarchyAction=\u968e\u5c64(&H)
 CTL_HierarchyTopComponent=\u968e\u5c64
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/includeview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/includeview/Bundle_ja.properties
index 8ee78dc..2c6a6a2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/includeview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/includeview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_IncludeViewTopComponent=C/C++\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u306e\u968e\u5c64
 HINT_IncludeViewTopComponent=C/C++\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u306e\u968e\u5c64\u30d3\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/macroview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/macroview/Bundle_ja.properties
index 99f0af3..3c26c80 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/macroview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/macroview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MacroExpansionAction=\u30de\u30af\u30ed\u306e\u5c55\u958b(&X)
 CTL_MacroExpansionTopComponent=\u30de\u30af\u30ed\u306e\u5c55\u958b
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/overrides/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/overrides/Bundle_ja.properties
index 253a40b..9e40401 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/overrides/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/overrides/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_IsOverriddenAnnotationAction=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3055\u308c\u305f\u6ce8\u91c8
 LAB_Overrides={0}\u3092\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/resources/Bundle_ja.properties
index 7bfed8e..b73d0fe 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Display-Category=C/C++
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/switchfiles/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/switchfiles/Bundle_ja.properties
index bb8b5bb..70f834a 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/switchfiles/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-navigation/cnd-navigation/org/netbeans/modules/cnd/navigation/switchfiles/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 Actions/Edit/org-netbeans-modules-cnd-navigation-switchfiles-CppSwitchAction.instance=\u30d8\u30c3\u30c0\u30fc/\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/Bundle_ja.properties
index 97f2736..cbd7675 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30d5\u30a1\u30a4\u30eb\u7528\u306e\u30ca\u30d3\u30b2\u30fc\u30bf\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\u3053\u306e\u30ea\u30b9\u30c8\u3092\u5229\u7528\u3059\u308b\u3068\u3001C/C++\u30b3\u30fc\u30c9\u3092\u3059\u3070\u3084\u304f\u30ca\u30d3\u30b2\u30fc\u30c8\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/navigator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/navigator/Bundle_ja.properties
index 6a59519..7ffdcb4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/navigator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-qnavigator/cnd-qnavigator/org/netbeans/modules/cnd/qnavigator/navigator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_NavigatorTopComponent=\u30ca\u30d3\u30b2\u30fc\u30bf\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6
 HINT_NavigatorTopComponent=\u30ca\u30d3\u30b2\u30fc\u30bf\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/Bundle_ja.properties
index 1a52a3b..7daa175 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=C/C++\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u30fb\u30b5\u30dd\u30fc\u30c8<br>\u73fe\u30d0\u30fc\u30b8\u30e7\u30f3\u3067\u63d0\u4f9b\u3055\u308c\u308b\u6a5f\u80fd:<br>- \u95a2\u6570\u306e\u30ed\u30fc\u30ab\u30eb\u5909\u6570\u306e\u5373\u6642\u540d\u524d\u5909\u66f4(Ctrl-R)<br>- \u30b0\u30ed\u30fc\u30d0\u30eb\u540d\u524d\u5909\u66f4(Ctrl-R)<br>- \u4f7f\u7528\u72b6\u6cc1\u3092\u691c\u7d22(Alt-F7)<br><br>\u6ce8: \u7cbe\u5ea6\u306b\u5bfe\u3059\u308b100%\u306e\u4fdd\u8a3c\u306f\u3042\u308a\u307e\u305b\u3093;\u53ef\u80fd\u306a\u304b\u304e\u308a\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u306e\u30d7\u30ec\u30d3\u30e5\u30fc\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/actions/Bundle_ja.properties
index c8a7fe8..58d1acc 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ERR_CannotRefactorLoc=\u3053\u3053\u306f\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u3067\u304d\u307e\u305b\u3093
 
 in-place-refactoring=C/C++\u306e\u540d\u524d\u306e\u5373\u6642\u5909\u66f4
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/Bundle_ja.properties
index 931a485..e82b423 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 complete-line-newline=\u884c\u3092\u5b8c\u4e86\u3057\u3066\u65b0\u3057\u3044\u884c\u3092\u4f5c\u6210
 complete-line=\u884c\u3092\u5b8c\u4e86
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/ui/Bundle_ja.properties
index deefe7a..8e465cd 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/codegen/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_inline_implementation=\u30a4\u30f3\u30e9\u30a4\u30f3\u30fb\u30e1\u30bd\u30c3\u30c9\u3092\u30af\u30e9\u30b9\u672c\u4f53\u306b\u5b9f\u88c5(&M)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/delegate/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/delegate/Bundle_ja.properties
index 2d6bad7..290ccdc 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/delegate/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/delegate/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 GENERATE=\u751f\u6210...
 GENERATE_HINT=\u65b0\u3057\u3044\u30e1\u30bd\u30c3\u30c9\u4f5c\u6210\u3092"\u30b3\u30fc\u30c9\u3092\u633f\u5165..."\u30a2\u30af\u30b7\u30e7\u30f3\u306b\u59d4\u4efb\u3057\u307e\u3059
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/implmethod/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/implmethod/Bundle_ja.properties
index c13ba1d..99b1c76 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/implmethod/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/implmethod/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 implement.txt=\u5b9f\u88c5
 extract.txt=\u672c\u6587\u306e\u62bd\u51fa
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/overridemethod/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/overridemethod/Bundle_ja.properties
index 119b7a2..d8e6d06 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/overridemethod/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/completion/overridemethod/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 override.txt=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9
 implement.txt=\u5b9f\u88c5
 destructor.txt=\u751f\u6210
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/Bundle_ja.properties
index f0ae705..41ee6f7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 HINT_IntroduceVariable=\u5909\u6570\u3092\u5c0e\u5165
 
 Suggestion_NAME=\u63d0\u6848
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/infrastructure/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/infrastructure/Bundle_ja.properties
index a8a2304..b177081 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/infrastructure/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/infrastructure/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ERR_Not_Selected=\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 ERR_No_Selection=\u9078\u629e\u306a\u3057
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/introduce/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/introduce/Bundle_ja.properties
index 1ec76f3..b2a0dd0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/introduce/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/introduce/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #actions in the Refactor menu:
 CTL_IntroduceVariableAction=\u5909\u6570\u3092\u5c0e\u5165(&V)...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_ja.properties
index 2860782..767aa1e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/plugins/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DSC_ElNotAvail=\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u306e\u5143\u306e\u8981\u7d20\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u524a\u9664\u3055\u308c\u3066\u3044\u308b\u304b\u3001\u5927\u5e45\u306b\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u4f7f\u7528\u72b6\u6cc1\u3092\u53ce\u96c6\u3067\u304d\u307e\u305b\u3093\u3002
 DSC_ElementNotResolved=\u672a\u89e3\u6c7a\u306e\u8981\u7d20\u3092\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/support/Bundle_ja.properties
index c49f507..72c63d4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/support/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_generate_button=\u751f\u6210
 LBL_cancel_button=\u53d6\u6d88
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/ui/Bundle_ja.properties
index 6edc3b1..5cca69b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_RenamePanelTitle={0} {1}\u306e\u540d\u524d\u3092\u5909\u66f4
 LBL_RenameComments=\u540d\u524d\u5909\u66f4\u3092\u30b3\u30e1\u30f3\u30c8\u306b\u9069\u7528(&C)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/Bundle_ja.properties
index 99574d3..3c251c5 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30a6\u30a3\u30b6\u30fc\u30c9\u304a\u3088\u3073\u30ea\u30e2\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb\u30d0\u30fc\u306e\u4f5c\u6210
 OpenIDE-Module-Name=C/C++\u30ea\u30e2\u30fc\u30c8\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8UI
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/actions/Bundle_ja.properties
index 9107be9..6d0c9b9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/actions/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenRemoteProjectAction.submenu.title=\u30ea\u30e2\u30fc\u30c8C/C++\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u958b\u304f
 ConnectionStatusAction.submenu.title=\u63a5\u7d9a\u30b9\u30c6\u30fc\u30bf\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/toolbar/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/toolbar/Bundle_ja.properties
index 3f02da2..808a1ad 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/toolbar/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/toolbar/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 RemoteHostAction.label=\u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30db\u30b9\u30c8\u306e\u9078\u629e
 ActiveHost.customize=\u30db\u30b9\u30c8\u306e\u7ba1\u7406
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_ja.properties
index 0db4fff..a3d38ae 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Template Folders
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/ide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/ide/Bundle_ja.properties
index 9019740..8a35e94 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/ide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/ide/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #ProjectOpenListSettings
 TXT_SelectTemplate=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/actions/Bundle_ja.properties
index 62f2c2d..810a5f7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_AddNewServer=\u65b0\u898f\u30b5\u30fc\u30d0\u30fc\u306e\u8ffd\u52a0...
 LBL_SetDefaultAction=\u30c7\u30d5\u30a9\u30eb\u30c8\u3068\u3057\u3066\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/actions/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/actions/base/Bundle_ja.properties
index bddce84..93c74e1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/actions/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/actions/base/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_ManagePlatforms_Name=\u30db\u30b9\u30c8\u306e\u7ba1\u7406...
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/sync/download/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/sync/download/Bundle_ja.properties
index abe216d..367d378 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/sync/download/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/sync/download/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SHARED_Factory_Name=\u30d5\u30a1\u30a4\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0\u306e\u5171\u6709(\u540c\u671f\u306a\u3057)
 SCP_Factory_Name=\u30bb\u30ad\u30e5\u30a2\u30fb\u30b3\u30d4\u30fc
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties
index faf5551..b1760eb 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties
@@ -1,43 +1,19 @@
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # AddServerDialog
 LBL_ServerTF=\u958b\u767a\u30b5\u30fc\u30d0\u30fc(&D):
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/networkneighbour/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/networkneighbour/Bundle_ja.properties
index 119b21f..a338e6c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/networkneighbour/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/networkneighbour/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 HostSelectionPanel.lblHostName.text=\u30db\u30b9\u30c8\u540d(&T):
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/proxysettings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/proxysettings/Bundle_ja.properties
index 5bdfa19..2f57036 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/proxysettings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/proxysettings/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ProxySettingsPanel.error.noProxySettings=\u30d7\u30ed\u30ad\u30b7\u69cb\u6210UI\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/resources/Bundle_ja.properties
index 52c4966..2d32ea0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u30ea\u30e2\u30fc\u30c8\u958b\u767aUI
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/server/Bundle_ja.properties
index 06440e5..33a031d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/server/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TITLE_EditServerList=\u30d3\u30eb\u30c9\u30fb\u30db\u30b9\u30c8\u30fb\u30de\u30cd\u30fc\u30b8\u30e3
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/setup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/setup/Bundle_ja.properties
index d458b46..04fd629 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/setup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/setup/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CreateNewHostWizardTitle=\u65b0\u898f\u30ea\u30e2\u30fc\u30c8\u30fb\u30db\u30b9\u30c8\u306e\u8a2d\u5b9a
 CreateHostVisualPanel0.Title=\u30db\u30b9\u30c8\u30fb\u30bf\u30a4\u30d7\u306e\u9078\u629e
 NoProviders_Message=\u9069\u5207\u306a\u30ea\u30e2\u30fc\u30c8\u8a2d\u5b9a\u30d7\u30ed\u30d0\u30a4\u30c0\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/wizard/Bundle_ja.properties
index 96f7e16..271f0ac 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/cnd/remote/ui/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CreateHostVisualPanel1.Title=\u30db\u30b9\u30c8\u306e\u9078\u629e
 CreateHostVisualPanel2.Title=\u30db\u30b9\u30c8\u306e\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/remote/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/remote/ui/Bundle_ja.properties
index bd618a0..ccd7e2c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/remote/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote-ui/cnd-remote-ui/org/netbeans/modules/remote/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_HostRootNode=C/C++\u30d3\u30eb\u30c9\u30fb\u30db\u30b9\u30c8
 AddHostMenuItem=\u65b0\u898f\u30db\u30b9\u30c8\u306e\u8ffd\u52a0...
 AddNewHostAction=\u65b0\u898f\u30db\u30b9\u30c8\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/Bundle_ja.properties
index 6856efa..17eab67 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u4f7f\u7528\u3059\u308b\u3068\u3001\u30ea\u30e2\u30fc\u30c8\u306eLinux\u307e\u305f\u306fSolaris\u30b5\u30fc\u30d0\u30fc\u4e0a\u3067\u958b\u767a\n(\u30b3\u30f3\u30d1\u30a4\u30eb\u3001\u7de8\u96c6\u3001\u5b9f\u884c\u3001\u304a\u3088\u3073\u30c7\u30d0\u30c3\u30b0)\u3092\u884c\u3048\u307e\u3059\u3002\u30b5\u30fc\u30d0\u30fc\u306f\u3001OpenSSH.org\u306eSSH2\u30d7\u30ed\u30c8\u30b3\u30eb\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\n\u307e\u305f\u3001\u30b5\u30fc\u30d0\u30fc\u306fssh\u3092\u6709\u52b9\u306b\u3057\u3001sshd\u3092\u5b9f\u884c\u307e\u305f\u306f\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u81ea\u52d5\u7684\n\u306b\u8d77\u52d5\u3059\u308b\u3088\u3046\u306b\u8a2d\u5b9a\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=C/C++\u30ea\u30e2\u30fc\u30c8\u958b\u767a
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/Bundle_ja.properties
index 62f2c2d..810a5f7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_AddNewServer=\u65b0\u898f\u30b5\u30fc\u30d0\u30fc\u306e\u8ffd\u52a0...
 LBL_SetDefaultAction=\u30c7\u30d5\u30a9\u30eb\u30c8\u3068\u3057\u3066\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/base/Bundle_ja.properties
index 263fdc7..f694958 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/actions/base/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_ManagePlatforms_Name=\u30db\u30b9\u30c8\u306e\u7ba1\u7406...
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/server/Bundle_ja.properties
index 06440e5..33a031d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/server/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TITLE_EditServerList=\u30d3\u30eb\u30c9\u30fb\u30db\u30b9\u30c8\u30fb\u30de\u30cd\u30fc\u30b8\u30e3
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/support/Bundle_ja.properties
index 2c183f4..e21bfe3 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/support/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TITLE_YN_Warning=\u8b66\u544a
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/Bundle_ja.properties
index 08544a7..c858997 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SHARED_Factory_Name=\u30b7\u30b9\u30c6\u30e0\u30fb\u30ec\u30d9\u30eb\u30fb\u30d5\u30a1\u30a4\u30eb\u5171\u6709(NFS\u3001Samba\u3001...)
 SCP_Factory_Name=\u30bb\u30ad\u30e5\u30a2\u30fb\u30b3\u30d4\u30fc(scp)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/download/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/download/Bundle_ja.properties
index abe216d..367d378 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/download/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/sync/download/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SHARED_Factory_Name=\u30d5\u30a1\u30a4\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0\u306e\u5171\u6709(\u540c\u671f\u306a\u3057)
 SCP_Factory_Name=\u30bb\u30ad\u30e5\u30a2\u30fb\u30b3\u30d4\u30fc
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties
index 04aec76..6d7ce6f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties
@@ -1,43 +1,19 @@
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # AddServerDialog
 LBL_ServerTF=\u958b\u767a\u30b5\u30fc\u30d0\u30fc(&D):
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/networkneighbour/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/networkneighbour/Bundle_ja.properties
index 119b21f..a338e6c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/networkneighbour/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/networkneighbour/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 HostSelectionPanel.lblHostName.text=\u30db\u30b9\u30c8\u540d(&T):
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/proxysettings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/proxysettings/Bundle_ja.properties
index 5bdfa19..2f57036 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/proxysettings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/proxysettings/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ProxySettingsPanel.error.noProxySettings=\u30d7\u30ed\u30ad\u30b7\u69cb\u6210UI\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/setup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/setup/Bundle_ja.properties
index d137e32..235f392 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/setup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/setup/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CreateNewHostWizardTitle=\u65b0\u898f\u30ea\u30e2\u30fc\u30c8\u30fb\u30db\u30b9\u30c8\u306e\u8a2d\u5b9a
 CreateHostVisualPanel0.Title=\u30db\u30b9\u30c8\u30fb\u30bf\u30a4\u30d7\u306e\u9078\u629e
 NoProviders_Message=\u9069\u5207\u306a\u30ea\u30e2\u30fc\u30c8\u8a2d\u5b9a\u30d7\u30ed\u30d0\u30a4\u30c0\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/wizard/Bundle_ja.properties
index 80a0952..7c78107 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CreateHostVisualPanel1.Title=\u30db\u30b9\u30c8\u306e\u9078\u629e
 CreateHostVisualPanel2.Title=\u30db\u30b9\u30c8\u306e\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/spi/remote/setup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/spi/remote/setup/Bundle_ja.properties
index 7925887..34f0600 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/spi/remote/setup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/spi/remote/setup/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CreateHostVisualPanel2.MsgAlreadyConnected1=%s\u3078\u306e\u63a5\u7d9a\u3092\u691c\u67fb
 CreateHostVisualPanel2.MsgConnectingTo={0}\u306b\u63a5\u7d9a\u3057\u3066\u3044\u307e\u3059...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/spi/remote/setup/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/spi/remote/setup/support/Bundle_ja.properties
index edc25cb..161eda0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/spi/remote/setup/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/spi/remote/setup/support/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ErrorDoubleRemote={1}\u306b\u5b58\u5728\u3059\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092{0}\u3067\u30d3\u30eb\u30c9\u307e\u305f\u306f\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_ja.properties
index 321d97d..961dd7c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_HostRootNode=C/C++\u30d3\u30eb\u30c9\u30fb\u30db\u30b9\u30c8
 AddHostMenuItem=\u65b0\u898f\u30db\u30b9\u30c8\u306e\u8ffd\u52a0...
 RemoveHostMenuItem=\u30db\u30b9\u30c8\u3092\u524a\u9664(%R)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-repository-api/cnd-repository-api/org/netbeans/modules/cnd/repository/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-repository-api/cnd-repository-api/org/netbeans/modules/cnd/repository/api/Bundle_ja.properties
index 2656916..02f95c9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-repository-api/cnd-repository-api/org/netbeans/modules/cnd/repository/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-repository-api/cnd-repository-api/org/netbeans/modules/cnd/repository/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u30ea\u30dd\u30b8\u30c8\u30eaAPI
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-repository/cnd-repository/org/netbeans/modules/cnd/repository/disk/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-repository/cnd-repository/org/netbeans/modules/cnd/repository/disk/Bundle_ja.properties
index 4258ccb..286e5d9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-repository/cnd-repository/org/netbeans/modules/cnd/repository/disk/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-repository/cnd-repository/org/netbeans/modules/cnd/repository/disk/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 IDE_Already_Running=\u5225\u306eIDE\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u3059\u3067\u306b\u5b9f\u884c\u4e2d\u3067\u3059
 Retry_Load=<html>IDE\u304cC/C++\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002<br>\u5225\u306eIDE\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u307e\u3060\u5b9f\u884c\u4e2d\u304b\u3001\u307e\u305f\u306f\u307e\u3060\u7d42\u4e86\u3057\u3066\u3044\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002<br>\u5225\u306eIDE\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u9589\u3058\u3001IDE\u304c\u7d42\u4e86\u3059\u308b\u307e\u3067\u5f85\u3063\u3066\u304b\u3089C/C++\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u518d\u30ed\u30fc\u30c9\u3057\u3066\u304f\u3060\u3055\u3044\u3002<br><b>\u300c\u3068\u308a\u3042\u3048\u305a\u7d9a\u884c\u3059\u308b\u300d\u3092\u9078\u629e\u3059\u308b\u3068\u3001IDE\u3067\u30b3\u30fc\u30c9\u652f\u63f4\u304c\u8aa4\u52d5\u4f5c\u3059\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059</b>\u3002
 Yes_Button=\u518d\u30ed\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-repository/cnd-repository/org/netbeans/modules/cnd/repository/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-repository/cnd-repository/org/netbeans/modules/cnd/repository/resources/Bundle_ja.properties
index eedb41a..bac266f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-repository/cnd-repository/org/netbeans/modules/cnd/repository/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-repository/cnd-repository/org/netbeans/modules/cnd/repository/resources/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u30b3\u30fc\u30c9\u652f\u63f4\u6a5f\u80fd\u306b\u6301\u7d9a\u6027\u6a5f\u69cb\u3092\u63d0\u4f9b\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/cmake/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/cmake/editor/Bundle_ja.properties
index 1e00934..8a52467 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/cmake/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/cmake/editor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 error=\u30a8\u30e9\u30fc
 keyword=\u30ad\u30fc\u30ef\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/editor/Bundle_ja.properties
index 36758e3..06e6631 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/editor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 keyword=\u30ad\u30fc\u30ef\u30fc\u30c9
 bare=\u7d20\u306e\u30c6\u30ad\u30b9\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/loaders/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/loaders/Bundle_ja.properties
index fb509ca..51710b0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/loaders/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/loaders/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Source=\u30bd\u30fc\u30b9(&S)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_ja.properties
index 1dd27b5..8c84112 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MENU_MakefileWizardActionName=\u65b0\u898fMakefile(&F)...
 LBL_MakefileWizardTitle=\u65b0\u898fMakefile
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/editor/Bundle_ja.properties
index 1e00934..8a52467 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/editor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 error=\u30a8\u30e9\u30fc
 keyword=\u30ad\u30fc\u30ef\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/loaders/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/loaders/Bundle_ja.properties
index fb509ca..51710b0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/loaders/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/loaders/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Source=\u30bd\u30fc\u30b9(&S)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/Bundle_ja.properties
index d7a3405..18f8cda 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u30b7\u30a7\u30eb\u30fb\u30b9\u30af\u30ea\u30d7\u30c8\u304a\u3088\u3073Makefile
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/bashScript_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/bashScript_ja.html
index 44ce6dc..2611d9c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/bashScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/bashScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/complexMakefile_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/complexMakefile_ja.html
index 5c81799..1ab3a8e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/complexMakefile_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/complexMakefile_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/cshScript_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/cshScript_ja.html
index 1c06db3..fd3da70 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/cshScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/cshScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/kshScript_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/kshScript_ja.html
index 74ad42a..0e2e2fc 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/kshScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/kshScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/makefiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/makefiles_ja.html
index 74bad4d..6b108cc 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/makefiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/makefiles_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/scriptTemplates_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/scriptTemplates_ja.html
index f073258..69f1d84 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/scriptTemplates_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/scriptTemplates_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/shScript_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/shScript_ja.html
index dc077fb..d192207 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/shScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/shScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/zshScript_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/zshScript_ja.html
index 0b124b2..3c20087 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/zshScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/script/resources/zshScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/impl/Bundle_ja.properties
index f770c54..e0e3209 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/impl/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_BrowseHostScopeDefinitionName={0}\u3067\u53c2\u7167...
 LBL_BrowseHostScopeBrowseName={1}\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea"{0}"
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/impl/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/impl/spi/Bundle_ja.properties
index 9012b93..1e29d5e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/impl/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/impl/spi/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CNDSearchForm.name=Grep
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/resources/Bundle_ja.properties
index f55b3b7..b171a98 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u30b7\u30a7\u30eb\u30fb\u30b3\u30de\u30f3\u30c9\u3092\u4f7f\u7528\u3057\u3066\u691c\u7d22
 OpenIDE-Module-Name=C/C++\u691c\u7d22
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/ui/Bundle_ja.properties
index 871c248..3fa33c1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-search/cnd-search/org/netbeans/modules/cnd/search/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CNDSearchPanel.lblText.text=\u6b63\u898f\u8868\u73fe\u3067\u691c\u7d22(grep\u69cb\u6587)(&R):
 CNDSearchPanel.lblScope.text=\u691c\u7d22\u7bc4\u56f2(&S):
 CNDSearchPanel.lblFilename.text=\u30d5\u30a1\u30a4\u30eb\u540d\u30d1\u30bf\u30fc\u30f3(&P):
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/Bundle_ja.properties
index 05130e1..f5ff37f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u7c21\u6613\u5358\u4f53\u30c6\u30b9\u30c8\u306e\u30b5\u30dd\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/editor/filecreation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/editor/filecreation/Bundle_ja.properties
index f5247cb..80e4f0b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/editor/filecreation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/editor/filecreation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Loclization for the manifest-editor.mf file.
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/Bundle_ja.properties
index 9757eec..c4836ca 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Test Files
 Templates/testFiles=C/C++\u30c6\u30b9\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/simple-test-c_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/simple-test-c_ja.html
index c5d59b5..0f9b291 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/simple-test-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/simple-test-c_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/simple-test-cc_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/simple-test-cc_ja.html
index 0b2b060..cd03cc4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/simple-test-cc_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/simple-test-cc_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/test-simple-c_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/test-simple-c_ja.html
index 96a40dd..54a372f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/test-simple-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/test-simple-c_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/test-simple-cpp_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/test-simple-cpp_ja.html
index ca0320e..0fb6cb7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/test-simple-cpp_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/test-simple-cpp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/testFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/testFiles_ja.html
index 91f75f0..96e7378 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/testFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/resources/testFiles_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/wizard/Bundle_ja.properties
index 17916ef..d79cd9b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-simpleunit/cnd-simpleunit/org/netbeans/modules/cnd/simpleunit/wizard/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 GenerateTestChooseElementsWizardPanelName=\u8981\u7d20\u3092\u9078\u629e
 GenerateTestChooseElementsVisualPanel.jLabel1.text=\u30c6\u30b9\u30c8\u3092\u751f\u6210\u3059\u308b\u95a2\u6570\u3092\u9078\u629e(&S):
 LBL_WaitNode=\u95a2\u6570\u4e00\u89a7\u3092\u521d\u671f\u5316\u3057\u3066\u3044\u307e\u3059...
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-source/cnd-source/org/netbeans/modules/cnd/source/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-source/cnd-source/org/netbeans/modules/cnd/source/Bundle_ja.properties
index 687993b..e1e1de2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-source/cnd-source/org/netbeans/modules/cnd/source/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-source/cnd-source/org/netbeans/modules/cnd/source/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FMT_Not_Valid_FileName=\u6307\u5b9a\u3057\u305f\u540d\u524d\u306f\u3001\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u4e2d\u3067\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093: {0}
 Source=\u30bd\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-source/cnd-source/org/netbeans/modules/cnd/source/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-source/cnd-source/org/netbeans/modules/cnd/source/resources/Bundle_ja.properties
index 4913308..81d6e38 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-source/cnd-source/org/netbeans/modules/cnd/source/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-source/cnd-source/org/netbeans/modules/cnd/source/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u30bd\u30fc\u30b9
 OpenIDE-Module-Short-Description=C/C++/Fortran\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u7528\u306e\u30c7\u30fc\u30bf\u30fb\u30ed\u30fc\u30c0\u30fc\u304a\u3088\u3073\u30c7\u30fc\u30bf\u30fb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-spellchecker-bindings/cnd-spellchecker-bindings/org/netbeans/modules/cnd/spellchecker/bindings/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-spellchecker-bindings/cnd-spellchecker-bindings/org/netbeans/modules/cnd/spellchecker/bindings/resources/Bundle_ja.properties
index 01ff0f7..a13ba40 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-spellchecker-bindings/cnd-spellchecker-bindings/org/netbeans/modules/cnd/spellchecker/bindings/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-spellchecker-bindings/cnd-spellchecker-bindings/org/netbeans/modules/cnd/spellchecker/bindings/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Name=C/C++\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u306e\u8a00\u8a9e\u30d0\u30a4\u30f3\u30c9
 OpenIDE-Module-Short-Description=C/C++\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u306e\u8a00\u8a9e\u30d0\u30a4\u30f3\u30c9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/Bundle_ja.properties
index db6a12a..d0d6634 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=C/C++\u30c6\u30b9\u30c8\u30fb\u30e9\u30f3\u30ca\u30fc
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Short-Description=C/C++\u30c6\u30b9\u30c8\u30fb\u30e9\u30f3\u30ca\u30fc
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/ui/Bundle_ja.properties
index 7952557..25eb179 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-testrunner/cnd-testrunner/org/netbeans/modules/cnd/testrunner/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2006-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TITLE_TEST_RESULTS=Python\u30c6\u30b9\u30c8\u7d50\u679c
 ResultWindowOpenAction.MenuName=Python\u30c6\u30b9\u30c8\u7d50\u679c(&T)
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties
index 7c70a60..a7778cd 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BTN_OK=OK
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_ja.properties
index 14014ad..3136161 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TAB_CodeAssistanceTab=\u30b3\u30fc\u30c9\u652f\u63f4
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/compilerset/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/compilerset/Bundle_ja.properties
index b86240e..377bfae 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/compilerset/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/compilerset/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NO_COMPILERS_FOUND_MSG=\u30b7\u30b9\u30c6\u30e0\u4e0a\u306b\u9069\u5207\u306a\u30b3\u30f3\u30d1\u30a4\u30e9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002IDE\u304c\u6b63\u3057\u304f\u52d5\u4f5c\u3059\u308b\u305f\u3081\u306b\u306f\u3001\u4e00\u9023\u306e\u9069\u5207\u306a\u30b3\u30f3\u30d1\u30a4\u30e9\u3068\u305d\u306e\u4ed6\u306e\u30d3\u30eb\u30c9\u30fb\u30c4\u30fc\u30eb\u304c\u5fc5\u8981\u3067\u3059\u3002\n\n\u3059\u3067\u306b\u30b7\u30b9\u30c6\u30e0\u306b\u30b3\u30f3\u30d1\u30a4\u30e9\u304c\u3042\u308b\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u5834\u5408\u3001\u6b21\u306e\u3044\u305a\u308c\u304b\u3092\u884c\u3044\u307e\u3059:\n\n1) IDE\u3092\u7d42\u4e86\u3057\u3066\u3001\u30b3\u30f3\u30d1\u30a4\u30e9\u3092PATH\u74b0\u5883\u5909\u6570\u306b\u8ffd\u52a0\u3057\u3001IDE\u3092\u518d\u8d77\u52d5\u3057\u307e\u3059\u3002\n\n2) \u300c\u30c4\u30fc\u30eb\u300d\u2192\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u2192\u300cC/C++\u300d\u2192\u300c\u30d3\u30eb\u30c9\u30fb\u30c4\u30fc\u30eb\u300d\u3067\u300c\u30d3\u30eb\u30c9\u30fb\u30c4\u30fc\u30eb\u300d\u30c0\u30a4\u30a2\u30ed\u30b0\u3092\u958b\u304d\u3001\u8a2d\u5b9a\u306b\u30b3\u30f3\u30d1\u30a4\u30e9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002\n\n\u30b7\u30b9\u30c6\u30e0\u306b\u30b3\u30f3\u30d1\u30a4\u30e9\u304c\u306a\u3044\u5834\u5408\u3001\u6b21\u306e\u4f5c\u696d\u3092\u884c\u3044\u307e\u3059:\n\n3) \u4e00\u9023\u306e\u9069\u5207\u306a\u30b3\u30f3\u30d1\u30a4\u30e9\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3001IDE\u3092\u518d\u8d77\u52d5\u3057\u307e\u3059\u3002\n\n\u8a73\u7d30\u306f\u3001\u8a18\u4e8b\u300cConfiguring the NetBeans IDE for C/C++/Fortran\u300d(http://netbeans.org/kb/trails/cnd.html)\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/impl/Bundle_ja.properties
index 14e4cf8..ba1851c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ErrorAnnotation
 HINT_CompilerError=\u30b3\u30f3\u30d1\u30a4\u30e9\u30fb\u30a8\u30e9\u30fc
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_ja.properties
index a038807..7b6c7e4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CndOptions_Title=C/C++\u306e\u8a2d\u5b9a
 CndOptionsCategory_Name=&C/C++
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/resources/Bundle_ja.properties
index d5b7386..dfab8ed 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain-ui/cnd-toolchain-ui/org/netbeans/modules/cnd/toolchain/ui/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u30c4\u30fc\u30eb\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3 - Swing
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/Bundle_ja.properties
index 6c638b2..9827d2d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CCompiler=C\u30b3\u30f3\u30d1\u30a4\u30e9
 CCCompiler=C++\u30b3\u30f3\u30d1\u30a4\u30e9
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/resources/Bundle_ja.properties
index aa111c8..a31ad79 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=C/C++\u30c4\u30fc\u30eb\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3API
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties
index 013166b..d476e5c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/api/toolchain/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BTN_OK=OK
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_ja.properties
index 173ec46..1f5d01d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u30c4\u30fc\u30eb\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3
 CND/ToolChains/OSS_solaris-sparc=Oracle Developer Studio
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/compilers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/compilers/Bundle_ja.properties
index 42203d8..f738203 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/compilers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/compilers/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CANTFINDCOMPILER={0}\u30b3\u30f3\u30d1\u30a4\u30e9\u3092\u5b9f\u884c\u3057\u3066\u3001\u7d44\u8fbc\u307f\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u30fb\u30d1\u30fc\u30b5\u30fc\u3092\u69cb\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\n{0}\u304cPATH\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3001IDE\u3092\u518d\u8d77\u52d5\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/compilerset/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/compilerset/Bundle_ja.properties
index 374a1df..fa0c7d9 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/compilerset/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/compilerset/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_EmptyCompilerSetName=\u306a\u3057
 LBL_EmptyCompilerSetDisplayName=\u30b3\u30f3\u30d1\u30a4\u30e9\u304c\u307f\u3064\u304b\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/execution/Bundle_ja.properties
index b4c1b4d..6d991cc 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/execution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ErrorAnnotation
 HINT_CompilerError=\u30b3\u30f3\u30d1\u30a4\u30e9\u30fb\u30a8\u30e9\u30fc
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_ja.properties
index 14014ad..3136161 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/compiler/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TAB_CodeAssistanceTab=\u30b3\u30fc\u30c9\u652f\u63f4
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_ja.properties
index 142cbdb..6921a16 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/ui/options/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CndOptions_Title=C/C++\u306e\u8a2d\u5b9a
 CndOptionsCategory_Name=&C/C++
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/actions/Bundle_ja.properties
index c4d44ae..f053127 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BTN_Execute=make
 BTN_Clean=make clean
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/builds/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/builds/Bundle_ja.properties
index 4b0cc3a..2d7237f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/builds/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/builds/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Tab titles for make execution
 # {0} - List of make targets we are executing, example "make clean"
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/editor/filecreation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/editor/filecreation/Bundle_ja.properties
index 0298ce8..3a44ed3 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/editor/filecreation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/editor/filecreation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Loclization for the manifest-editor.mf file.
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/execution/Bundle_ja.properties
index a75f14b..4db54d1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/execution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PROP_CCExecutorBean=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30d0\u30a4\u30ca\u30ea\u5b9f\u884c
 HINT_CCExecutorBean=C/C++/Fortran\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5b9f\u884c
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/loaders/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/loaders/Bundle_ja.properties
index 45de13a..6701895 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/loaders/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/loaders/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 displayNameForExeElfNodeExecSheet=\u5b9f\u884c
 hintForExeElfNodeExecSheet=\u3053\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5b9f\u884c\u3059\u308b\u305f\u3081\u306e\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cFiles_ja.html
index d8208de..234a3ef 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cFiles_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/class_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/class_ja.html
index ce6a2fb..77e00f1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/class_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/class_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cmdline_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cmdline_ja.html
index 23b06ee..e72658e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cmdline_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cmdline_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cppFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cppFiles_ja.html
index f3d140f..c8b6ee7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cppFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/cppFiles_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-c_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-c_ja.html
index 1356ad7..726e166 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-c_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-cc_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-cc_ja.html
index d90ad1c..83a5ae6 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-cc_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-cc_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-f90_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-f90_ja.html
index 18cfd63..3899b4c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-f90_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/empty-f90_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/file_header_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/file_header_ja.html
index add6bc7..14ca65d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/file_header_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/file_header_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/file_plus_header_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/file_plus_header_ja.html
index 7a4c98f..4e8eab2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/file_plus_header_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/file_plus_header_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/fixed-fortran-f_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/fixed-fortran-f_ja.html
index a085b37..d65b117 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/fixed-fortran-f_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/fixed-fortran-f_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/fortranFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/fortranFiles_ja.html
index 42e4be1..ba98c73 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/fortranFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/fortranFiles_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/free-fortran-f90_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/free-fortran-f90_ja.html
index 361f781..9eabf91 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/free-fortran-f90_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/free-fortran-f90_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intervals_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intervals_ja.html
index 2be4021..013d8af 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intervals_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intervals_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intgen_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intgen_ja.html
index af6de14..802d30f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intgen_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intgen_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intmat_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intmat_ja.html
index 1ea290b..c9de43e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intmat_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/intmat_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/jniFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/jniFiles_ja.html
index e83cc2b..0fae38e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/jniFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/jniFiles_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/jni_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/jni_ja.html
index 26a1930..9970c5f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/jni_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/jni_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/module-f90_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/module-f90_ja.html
index dd4036f..2663a25 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/module-f90_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/module-f90_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/motif_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/motif_ja.html
index 3f355e7..2e0d3de 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/motif_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/motif_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtfiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtfiles_ja.html
index 791db62..a009fd0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtfiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtfiles_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtform_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtform_ja.html
index 5a11c09..4daa8af 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtform_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtform_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtresource_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtresource_ja.html
index 4b95e7c..4806b5b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtresource_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qtresource_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qttranslation_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qttranslation_ja.html
index 7bd5382..aab2c84 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qttranslation_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/qttranslation_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-c-h_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-c-h_ja.html
index d8af530..682a212 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-c-h_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-c-h_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-c_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-c_ja.html
index 6ae7e46..74b873c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-c_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-h_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-h_ja.html
index 933b6b2..b6d90fd 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-h_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-h_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-qt_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-qt_ja.html
index 64a008a..e68c608 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-qt_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-qt_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-standard-header_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-standard-header_ja.html
index 0b9aa64..794b110 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-standard-header_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc-standard-header_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc_ja.html
index ffdcd35..9e07ffb 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/simple-cc_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/solarisPrograms_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/solarisPrograms_ja.html
index 8aa9c84..faabd10 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/solarisPrograms_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/resources/solarisPrograms_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/settings/Bundle_ja.properties
index af9b297..caac1f3 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/settings/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OPTION_CPP_SETTINGS_NAME=C/C++/Fortran\u30bd\u30fc\u30b9
 HINT_CPP_SETTINGS_NAME=C/C++/Fortran\u306e\u958b\u767a\u306b\u4f7f\u7528\u3055\u308c\u308b\u30aa\u30d7\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/ui/options/Bundle_ja.properties
index fef1a53..2227edf 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/ui/options/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # OtherOptionsPanel
 TAB_CndOtherOptionsTab=\u305d\u306e\u4ed6
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/ui/resources/Bundle_ja.properties
index 5cc9e77..748dbe7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-ui/cnd-ui/org/netbeans/modules/cnd/ui/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++\u30b3\u30a2UI
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-utils-ui/cnd-utils-ui/org/netbeans/modules/cnd/utils/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-utils-ui/cnd-utils-ui/org/netbeans/modules/cnd/utils/ui/Bundle_ja.properties
index 54db485..b7c03b7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-utils-ui/cnd-utils-ui/org/netbeans/modules/cnd/utils/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-utils-ui/cnd-utils-ui/org/netbeans/modules/cnd/utils/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_Cancelling=\u53d6\u6d88\u3057\u4e2d...
 ModalMessageDlgCancellablePane.btnCancel.text=\u53d6\u6d88
 MSG_CancelFailed={0}\u306e\u53d6\u6d88\u3057\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-utils-ui/cnd-utils-ui/org/netbeans/modules/cnd/utils/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-utils-ui/cnd-utils-ui/org/netbeans/modules/cnd/utils/ui/resources/Bundle_ja.properties
index 881a017..6f4a4dd 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-utils-ui/cnd-utils-ui/org/netbeans/modules/cnd/utils/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-utils-ui/cnd-utils-ui/org/netbeans/modules/cnd/utils/ui/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=C/C++ UI\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/Bundle_ja.properties
index 95a1fed..89b6aff 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CCExtResolver=C++ MIME\u30ea\u30be\u30eb\u30d0(ext\u30d9\u30fc\u30b9)
 CExtResolver=C MIME\u30ea\u30be\u30eb\u30d0(ext\u30d9\u30fc\u30b9)
 ContentResolver=H MIME\u30ea\u30be\u30eb\u30d0(\u30b3\u30f3\u30c6\u30f3\u30c4\u30fb\u30d9\u30fc\u30b9)
@@ -12,43 +29,6 @@
 MakeResolver.FileChooserName=Makefile
 MakeResolver.Name=Makefile\u30ea\u30be\u30eb\u30d0
 NameExtResolver=C Make\u30d5\u30a1\u30a4\u30eb
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u5171\u901aC/C++\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 OpenIDE-Module-Name=C/C++\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/filters/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/filters/Bundle_ja.properties
index 553effe..065b2bd 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/filters/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/filters/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # FileChooser
 FILECHOOSER_ELFEXECUTABLE_FILEFILTER=ELF\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/resources/Bundle_ja.properties
index 7cabc26..c79f5e8 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u5171\u901aC/C++\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 OpenIDE-Module-Name=C/C++\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/ui/Bundle_ja.properties
index 5ef1471..41758ff 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd-utils/cnd-utils/org/netbeans/modules/cnd/utils/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_Cancelling=\u53d6\u6d88\u3057\u4e2d...
 ModalMessageDlgCancellablePane.btnCancel.text=\u53d6\u6d88
 MSG_CancelFailed={0}\u306e\u53d6\u6d88\u3057\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/Bundle_ja.properties
index 33be68d..7b3e42c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # localization for manifest.mf file
 OpenIDE-Module-Name=C/C++\u30b3\u30a2
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/actions/Bundle_ja.properties
index 656d352..e5e29da 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BTN_Execute=make
 BTN_Clean=make clean
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/api/xml/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/api/xml/Bundle_ja.properties
index 94146dc..ee61041 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/api/xml/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/api/xml/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 UNKNOWN_sourceName=<\u4e0d\u660e>
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/builds/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/builds/Bundle_ja.properties
index 0238721..46eccfc 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/builds/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/builds/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Tab titles for make execution
 # {0} - List of make targets we are executing, example "make clean"
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/editor/filecreation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/editor/filecreation/Bundle_ja.properties
index dee4773..8b04a60 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/editor/filecreation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/editor/filecreation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Loclization for the manifest-editor.mf file.
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/execution/Bundle_ja.properties
index a75f14b..4db54d1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/execution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PROP_CCExecutorBean=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30d0\u30a4\u30ca\u30ea\u5b9f\u884c
 HINT_CCExecutorBean=C/C++/Fortran\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5b9f\u884c
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/loaders/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/loaders/Bundle_ja.properties
index cd993ec..5d1e0db 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/loaders/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/loaders/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 displayNameForExeElfNodeExecSheet=\u5b9f\u884c
 hintForExeElfNodeExecSheet=\u3053\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5b9f\u884c\u3059\u308b\u305f\u3081\u306e\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/Bundle_ja.properties
index 87ced89..aa0645b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Menu/Help/NetBeansCCDevelopmentPack.url=C/C++\u958b\u767a\u30d1\u30c3\u30af\u306eFAQ
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cFiles_ja.html
index 6ddb0ef..234a3ef 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cFiles_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/class_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/class_ja.html
index 435dd98..77e00f1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/class_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/class_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cmdline_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cmdline_ja.html
index 24913f0..e72658e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cmdline_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cmdline_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cppFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cppFiles_ja.html
index 3b2f9fb..c8b6ee7 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cppFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/cppFiles_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-c_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-c_ja.html
index 5f79581..726e166 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-c_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-cc_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-cc_ja.html
index b7b78c4..83a5ae6 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-cc_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-cc_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-f90_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-f90_ja.html
index 3055915..3899b4c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-f90_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/empty-f90_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/fixed-fortran-f_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/fixed-fortran-f_ja.html
index 4715577..d65b117 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/fixed-fortran-f_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/fixed-fortran-f_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/fortranFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/fortranFiles_ja.html
index 1f5dc94..ba98c73 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/fortranFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/fortranFiles_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/free-fortran-f90_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/free-fortran-f90_ja.html
index a0b3e0e..9eabf91 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/free-fortran-f90_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/free-fortran-f90_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intervals_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intervals_ja.html
index 0455c6e..013d8af 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intervals_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intervals_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intgen_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intgen_ja.html
index d9d9e5f..802d30f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intgen_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intgen_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intmat_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intmat_ja.html
index 75467f2..c9de43e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intmat_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/intmat_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/jniFiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/jniFiles_ja.html
index 3648690..0fae38e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/jniFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/jniFiles_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/jni_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/jni_ja.html
index d134535..9970c5f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/jni_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/jni_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/module-f90_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/module-f90_ja.html
index 49da2b8..2663a25 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/module-f90_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/module-f90_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/motif_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/motif_ja.html
index f248587..2e0d3de 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/motif_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/motif_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtfiles_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtfiles_ja.html
index 2bc665c..a009fd0 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtfiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtfiles_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2008 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtform_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtform_ja.html
index fd1bd5e..4daa8af 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtform_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtform_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2008 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtresource_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtresource_ja.html
index 4ca5b3d..4806b5b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtresource_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qtresource_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2009 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qttranslation_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qttranslation_ja.html
index 5377fc2..aab2c84 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qttranslation_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/qttranslation_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2009 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c-h_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c-h_ja.html
index 618c24b..682a212 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c-h_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c-h_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c_ja.html
index bc01037..74b873c 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-c_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-h_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-h_ja.html
index a0042e8..b6d90fd 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-h_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-h_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-qt_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-qt_ja.html
index 6aa0612..e68c608 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-qt_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-qt_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2008 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-standard-header_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-standard-header_ja.html
index 2bd8236..794b110 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-standard-header_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc-standard-header_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc_ja.html
index 0e35944..9e07ffb 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/simple-cc_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/solarisPrograms_ja.html b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/solarisPrograms_ja.html
index d0c5d81..faabd10 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/solarisPrograms_ja.html
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/resources/solarisPrograms_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/settings/Bundle_ja.properties
index af9b297..caac1f3 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/settings/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OPTION_CPP_SETTINGS_NAME=C/C++/Fortran\u30bd\u30fc\u30b9
 HINT_CPP_SETTINGS_NAME=C/C++/Fortran\u306e\u958b\u767a\u306b\u4f7f\u7528\u3055\u308c\u308b\u30aa\u30d7\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/ui/options/Bundle_ja.properties
index 847aec6..2227edf 100755
--- a/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/cnd/cnd/org/netbeans/modules/cnd/ui/options/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # OtherOptionsPanel
 TAB_CndOtherOptionsTab=\u305d\u306e\u4ed6
diff --git a/netbeans-l10n-zip/src/ja/cnd/jellytools-cnd/jellytools-cnd/org/netbeans/modules/jellytools/cnd/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/jellytools-cnd/jellytools-cnd/org/netbeans/modules/jellytools/cnd/Bundle_ja.properties
index a5b6fa3..67119a3 100755
--- a/netbeans-l10n-zip/src/ja/cnd/jellytools-cnd/jellytools-cnd/org/netbeans/modules/jellytools/cnd/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/jellytools-cnd/jellytools-cnd/org/netbeans/modules/jellytools/cnd/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Jelly\u30c4\u30fc\u30ebCND
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_ja.properties
index a428b4e..e8d35e3 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-analysis/org/clang/analysis/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/Analysis
 OpenIDE-Module-Name=Clank clang/Analysis (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/Analysis
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-arcmigrate/org/clang/arcmigrate/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-arcmigrate/org/clang/arcmigrate/resources/Bundle_ja.properties
index 749d4f5..1e43a20 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-arcmigrate/org/clang/arcmigrate/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-arcmigrate/org/clang/arcmigrate/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/ARCMigrate
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_ja.properties
index dc09100..9e8bdce 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-ast/org/clang/ast/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/AST
 OpenIDE-Module-Name=Clank clang/AST (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/AST
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-astmatchers/org/clang/astmatchers/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-astmatchers/org/clang/astmatchers/resources/Bundle_ja.properties
index cb1e6dd..6635f4d 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-astmatchers/org/clang/astmatchers/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-astmatchers/org/clang/astmatchers/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/ASTMatchers (3.9 NO_BODY)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_ja.properties
index 39b08a6..add5037 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-basic/org/clang/basic/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/Basic
 OpenIDE-Module-Name=Clank clang/Basic (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Basic
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-clangc/org/clang/clangc/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-clangc/org/clang/clangc/resources/Bundle_ja.properties
index 58c5782..350a238 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-clangc/org/clang/clangc/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-clangc/org/clang/clangc/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/Clang-C (libClang API) (3.9 DONE)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-codegen/org/clang/codegen/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-codegen/org/clang/codegen/resources/Bundle_ja.properties
index 828e73d..751ca8e 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-codegen/org/clang/codegen/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-codegen/org/clang/codegen/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/CodeGen
 OpenIDE-Module-Name=Clank clang/CodeGen
 OpenIDE-Module-Short-Description=clang/CodeGen
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_ja.properties
index 48eb67d..ba4af4b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-driver/org/clang/driver/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/Driver
 OpenIDE-Module-Name=Clank clang/Driver (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Driver
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-edit/org/clang/edit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-edit/org/clang/edit/Bundle_ja.properties
index 48df21e..a54c14b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-edit/org/clang/edit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-edit/org/clang/edit/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/Edit
 OpenIDE-Module-Name=Clank clang/Edit (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Edit
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-format/org/clang/format/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-format/org/clang/format/resources/Bundle_ja.properties
index a0c1a32..a72c76b 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-format/org/clang/format/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-format/org/clang/format/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/Format (3.9 NO_BODY)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_ja.properties
index 15f784c..5973728 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontend/org/clang/frontend/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/Frontend
 OpenIDE-Module-Name=Clank clang/Frontend (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Frontend
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_ja.properties
index 2435c00..01a6c27 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-frontendtool/org/clang/frontendtool/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/FrontendTool
 OpenIDE-Module-Name=Clank clang/FrontendTool (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/FrontendTool
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-index/org/clang/index/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-index/org/clang/index/resources/Bundle_ja.properties
index 476a41f..54c957f 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-index/org/clang/index/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-index/org/clang/index/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/Index
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_ja.properties
index a3f4146..ed0afc1 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-lex/org/clang/lex/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/Lex
 OpenIDE-Module-Name=Clank clang/Lex (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/Lex
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_ja.properties
index a7e548c..5ec5c01 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-parse/org/clang/parse/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/Parse
 OpenIDE-Module-Name=Clank clang/Parse (3.9 DOING BODY)
 OpenIDE-Module-Short-Description=clang/Parse
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_ja.properties
index c6d96da..0a238b6 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-rewrite/org/clang/rewrite/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/Rewrite (3.9 DONE)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_ja.properties
index e1be2da..5723260 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-sema/org/clang/sema/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/Sema
 OpenIDE-Module-Name=Clank clang/Sema (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/Sema
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_ja.properties
index 099b9b8..5b43098 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-serialization/org/clang/serialization/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=clang/Serialization
 OpenIDE-Module-Name=Clank clang/Serialization (3.9 NO_BODY)
 OpenIDE-Module-Short-Description=clang/Serialization
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-staticanalyzer/org/clang/staticanalyzer/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-staticanalyzer/org/clang/staticanalyzer/resources/Bundle_ja.properties
index 71c6f16..c12cba4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-staticanalyzer/org/clang/staticanalyzer/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-staticanalyzer/org/clang/staticanalyzer/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/StaticAnalyzer
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tidy/org/clang/tidy/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tidy/org/clang/tidy/resources/Bundle_ja.properties
index fbbe640..97df067 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tidy/org/clang/tidy/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tidy/org/clang/tidy/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/Tidy
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tooling/org/clang/tooling/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tooling/org/clang/tooling/resources/Bundle_ja.properties
index a8ad2ff..fbeca69 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tooling/org/clang/tooling/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tooling/org/clang/tooling/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/Tooling (3.9 NO_BODY)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_ja.properties
index 2da199a..d2a46e4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-driver/org/clang/tools/driver/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang/tools/driver (3.9 DONE)
 OpenIDE-Module-Short-Description=clang/tools/driver
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_ja.properties
index 587ea0a..60b78de 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clang-tools-services/org/clang/tools/services/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank clang\u30d9\u30fc\u30b9\u306e\u30b5\u30fc\u30d3\u30b9(JAVA)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_ja.properties
index 3770650..95d7653 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-clank-java/org/clank/java/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=C\u69cb\u9020\u7528Java\u30af\u30e9\u30b9
 OpenIDE-Module-Name=Java\u3067\u306eClank C\u30e9\u30c3\u30d1\u30fc(JAVA)
 OpenIDE-Module-Short-Description=C\u69cb\u9020\u7528Java\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_ja.properties
index 46d7f11..215d535 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-adtsupport/org/llvm/adtsupport/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=llvm/ADT\u3001llvm/Support\u3001llvm/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 --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_ja.properties
index a366fed..3d31590 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-bitcode/org/llvm/bitcode/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank llvm/Bitcode (3.9 NO_BODY)
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-ir/org/llvm/ir/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-ir/org/llvm/ir/resources/Bundle_ja.properties
index faadc2b..3ec4276 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-ir/org/llvm/ir/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-ir/org/llvm/ir/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank llvm/IR
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-linker/org/llvm/linker/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-linker/org/llvm/linker/resources/Bundle_ja.properties
index 81b09cd..7468f52 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-linker/org/llvm/linker/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-linker/org/llvm/linker/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank llvm/Linker
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_ja.properties
index 0523064..3b94a74 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-option/org/llvm/option/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=llvm/Option
 OpenIDE-Module-Name=Clank llvm/Option (3.9 DONE)
 OpenIDE-Module-Short-Description=llvm/Option
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-passes/org/llvm/passes/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-passes/org/llvm/passes/resources/Bundle_ja.properties
index 78e91dc..fe20167 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-passes/org/llvm/passes/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-passes/org/llvm/passes/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank llvm/Passes
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-profiledata/org/llvm/profiledata/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-profiledata/org/llvm/profiledata/resources/Bundle_ja.properties
index f993cbf..94c2a15 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-profiledata/org/llvm/profiledata/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-profiledata/org/llvm/profiledata/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank llvm/ProfileData
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-target/org/llvm/target/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-target/org/llvm/target/resources/Bundle_ja.properties
index faf3367..62f6ea2 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-target/org/llvm/target/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-target/org/llvm/target/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank llvm/Target
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-utils/org/llvm/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-utils/org/llvm/utils/Bundle_ja.properties
index 0fe29db..29d10f4 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-utils/org/llvm/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm-utils/org/llvm/utils/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank llvm/utils
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm/org/llvm/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm/org/llvm/resources/Bundle_ja.properties
index 6156c4b..5157a05 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm/org/llvm/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/ext/org-llvm/org/llvm/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Clank llvm/LLVM
 
diff --git a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/org-netbeans-libs-clank/org/netbeans/libs/clank/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/org-netbeans-libs-clank/org/netbeans/libs/clank/Bundle_ja.properties
index c7590f5..43e08bf 100755
--- a/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/org-netbeans-libs-clank/org/netbeans/libs/clank/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cnd/org-netbeans-libs-clank/org-netbeans-libs-clank/org/netbeans/libs/clank/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=C/C++ JClank\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30e9\u30c3\u30d1\u30fc
 OpenIDE-Module-Display-Category=C/C++
diff --git a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/Bundle_ja.properties
index 783b7a6..67b1a02 100755
--- a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java/Cpp\u6df7\u5728\u958b\u767a\u30b5\u30dd\u30fc\u30c8
 
 Editors/text/x-java/Popup/MixedDevelopment=\u6df7\u5728\u958b\u767a
diff --git a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/debugger/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/debugger/Bundle_ja.properties
index c3c82f4..afcac39 100755
--- a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/debugger/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/debugger/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_ProcessDetectionError=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30d7\u30ed\u30bb\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 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
 
diff --git a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/java/jni/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/java/jni/actions/Bundle_ja.properties
index c39d192..a4293e9 100755
--- a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/java/jni/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/java/jni/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Action_CopyJNICallMethodCodeAction=\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u53d6\u5f97\u30b3\u30fc\u30c9
 LBL_Action_CopyJNIGetFieldCodeAction=\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u53d6\u5f97\u30b3\u30fc\u30c9
 LBL_Action_CopyJNISetFieldCodeAction=\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u8a2d\u5b9a\u30b3\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/java/jni/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/java/jni/ui/Bundle_ja.properties
index e10d7dc..fde988f 100755
--- a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/java/jni/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/java/jni/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 JProjectFileChooser.expandAllButton.text=\u3059\u3079\u3066\u5c55\u958b
 JProjectFileChooser.collapseAllButton.text=\u3059\u3079\u3066\u7e2e\u5c0f
 JProjectFileChooser.selectButton.text=\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/wizard/Bundle_ja.properties
index c3dd4e1..7676296 100755
--- a/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/cndext/cnd-mixeddev/cnd-mixeddev/org/netbeans/modules/cnd/mixeddev/wizard/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 Action.Name=JNI\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u751f\u6210
 Wizard.Name=\u65b0\u898fJNI\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 Step.Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u540d\u524d\u3068\u5834\u6240
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-kit/dlight-kit/org/netbeans/modules/dlight/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-kit/dlight-kit/org/netbeans/modules/dlight/kit/Bundle_ja.properties
index 7b798d6..9f662c5 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-kit/dlight-kit/org/netbeans/modules/dlight/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-kit/dlight-kit/org/netbeans/modules/dlight/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b5\u30dd\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Long-Description=DLight\u30c4\u30fc\u30eb\u30fb\u30ad\u30c3\u30c8
 OpenIDE-Module-Name=DLight
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-libs-common/dlight-libs-common/org/netbeans/modules/dlight/libs/common/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-libs-common/dlight-libs-common/org/netbeans/modules/dlight/libs/common/resources/Bundle_ja.properties
index 4fa7e09..cc15061 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-libs-common/dlight-libs-common/org/netbeans/modules/dlight/libs/common/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-libs-common/dlight-libs-common/org/netbeans/modules/dlight/libs/common/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b5\u30dd\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Name=DLight\u5171\u901a\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Short-Description=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b5\u30dd\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb\u5171\u901a\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/actions/Bundle_ja.properties
index b850a26..01073d5 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/actions/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LAB_FastPaste=\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u3057\u306a\u3044\u3067\u8cbc\u4ed8\u3051
 EXC_CannotCopyTheSame={0}\u30d5\u30a9\u30eb\u30c0\u3092\u305d\u308c\u81ea\u8eab\u306e\u4e2d\u306b\u30b3\u30d4\u30fc\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
 EXC_CannotCopySubfolder={0}\u30d5\u30a9\u30eb\u30c0\u3092\u30b3\u30d4\u30fc\u3067\u304d\u307e\u305b\u3093\u3002\u5b9b\u5148\u30d5\u30a9\u30eb\u30c0\u306f\u30bd\u30fc\u30b9\u30fb\u30d5\u30a9\u30eb\u30c0\u306e\u30b5\u30d6\u30d5\u30a9\u30eb\u30c0\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/Bundle_ja.properties
index f043a5b..6e30a19 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ERR_CreateDir=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea{0}\u306e\u4f5c\u6210\u30a8\u30e9\u30fc
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/server/Bundle_ja.properties
index c7c9c62..7f87dca 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/server/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 EchoInProfile_Title=\u8b66\u544a: {0}\u306b\u3042\u308b\u30ed\u30b0\u30a4\u30f3\u30fb\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u30c6\u30ad\u30b9\u30c8\u3092\u78ba\u8a8d\u8868\u793a\u3057\u307e\u3059
 EchoInProfile_Details={0}\u306b\u3042\u308b\u30ed\u30b0\u30a4\u30f3\u30fb\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u30c6\u30ad\u30b9\u30c8\u3092\u78ba\u8a8d\u8868\u793a\u3057\u307e\u3059\u3002\u305d\u306e\u3053\u3068\u304c\u7406\u7531\u3067\u3001IDE\u304c\u6a5f\u80fd\u3057\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/ui/Bundle_ja.properties
index 111ceb5..99e6a11 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/fs/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - host name, {1} - reasons
 ConnectionNotifier.TITLE=IDE\u3067{0}\u306b\u518d\u63a5\u7d9a\u3059\u308b\u5fc5\u8981\u3042\u308a
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/resources/Bundle_ja.properties
index 5b2c948..202d9c2 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-impl/dlight-remote-impl/org/netbeans/modules/remote/impl/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b5\u30dd\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Name=\u30ea\u30e2\u30fc\u30c8\u5b9f\u88c5
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-ui/dlight-remote-ui/org/netbeans/modules/remote/api/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-ui/dlight-remote-ui/org/netbeans/modules/remote/api/ui/Bundle_ja.properties
index 8e73ad3..e90f5b5 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-ui/dlight-remote-ui/org/netbeans/modules/remote/api/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-ui/dlight-remote-ui/org/netbeans/modules/remote/api/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 REMOTE_CHOOSER_TITLE={1}\u306e{0}
 LBL_NewFolder=\u65b0\u898f\u30d5\u30a9\u30eb\u30c0
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-ui/dlight-remote-ui/org/netbeans/modules/remote/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-ui/dlight-remote-ui/org/netbeans/modules/remote/ui/resources/Bundle_ja.properties
index f1f40d2..5fed207 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote-ui/dlight-remote-ui/org/netbeans/modules/remote/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote-ui/dlight-remote-ui/org/netbeans/modules/remote/ui/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30ea\u30e2\u30fc\u30c8API - Swing
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/api/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/api/ui/Bundle_ja.properties
index 8e73ad3..e90f5b5 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/api/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/api/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 REMOTE_CHOOSER_TITLE={1}\u306e{0}
 LBL_NewFolder=\u65b0\u898f\u30d5\u30a9\u30eb\u30c0
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/resources/Bundle_ja.properties
index 8069b61..f376002 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b5\u30dd\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Name=\u30ea\u30e2\u30fc\u30c8API
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/spi/Bundle_ja.properties
index a0e3b79..a9da49f 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-remote/dlight-remote/org/netbeans/modules/remote/spi/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AccessType_Fast=\u9ad8\u901f(ACL\u30c1\u30a7\u30c3\u30af\u306a\u3057)
 AccessType_Full=\u5b8c\u5168(ACL\u3092\u8003\u616e)
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/action/Bundle_ja.properties
index 98a4476..950edcb 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/action/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SendToMenuName=\u9001\u4fe1\u5148...
 EmptyAction.text=\u9078\u629e\u3055\u308c\u3066\u3044\u308b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u306f\u30b3\u30de\u30f3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/api/Bundle_ja.properties
index 8b2770a..03876cd 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/api/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Configuration.default.DisplayName=\u540d\u524d\u306a\u3057
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/config/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/config/Bundle_ja.properties
index f350662..ff5ad9a 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/config/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/config/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Options=\u9001\u4fe1\u5148
 OutputWindow.SendTo.name=\u9001\u4fe1\u5148
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/conifg/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/conifg/impl/Bundle_ja.properties
index 84925d1..00d2a32 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/conifg/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/conifg/impl/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DefaultScriptConfigurator.description.text=\u30d1\u30e9\u30e1\u30fc\u30bf\u3068\u3057\u3066\u30d5\u30a1\u30a4\u30eb\u3092\u53d7\u3051\u5165\u308c\u308b\u30b9\u30af\u30ea\u30d7\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/conifg/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/conifg/ui/Bundle_ja.properties
index a88dbbe..99a08e3 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/conifg/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/conifg/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ScriptPanel.scriptLabel.text=\u30b9\u30af\u30ea\u30d7\u30c8(&S):
 ScriptPanel.scriptFld.toolTipText=\u5f15\u6570\u3092\u691c\u8a3c\u3059\u308b\u305f\u3081\u306b\u5b9f\u884c\u3055\u308c\u308b\u30b9\u30af\u30ea\u30d7\u30c8(\u9078\u629e\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb)\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/resources/Bundle_ja.properties
index 7e8345c..b37bcfb 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b5\u30dd\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Long-Description=\u9078\u629e\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30a8\u30c7\u30a3\u30bf\u306e\u9078\u629e\u3067\u30e6\u30fc\u30b6\u30fc\u5b9a\u7fa9\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/util/Bundle_ja.properties
index c1f6140..85b6217 100755
--- a/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/dlight-sendto/dlight-sendto/org/netbeans/modules/dlight/sendto/util/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OutputWindow.SendTo.name=\u9001\u4fe1\u5148 - {0}
 Execution.ExitStatus.text=\u7d42\u4e86\u30b9\u30c6\u30fc\u30bf\u30b9: {0}
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/Bundle_ja.properties
index 118d32f..e1ad4c8 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/svnclientadapter/manifest.mf
 OpenIDE-Module-Name=\u30ea\u30e2\u30fc\u30c8Git\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/jgit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/jgit/Bundle_ja.properties
index b393008..8e3c6de 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/jgit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/jgit/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Exception_IdNotACommit = \u6307\u5b9a\u3055\u308c\u305fID [{0}]\u306f\u30b3\u30df\u30c3\u30c8\u307e\u305f\u306f\u6ce8\u91c8\u306e\u3042\u308b\u30bf\u30b0\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 MSG_Exception_IdNotUnique = \u6307\u5b9a\u3055\u308c\u305fobjectId [{0}]\u306f\u4e00\u610f\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/jgit/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/jgit/commands/Bundle_ja.properties
index d8ccbd7..daecd95 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/jgit/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote-cli/git-remote-cli/org/netbeans/modules/git/remote/cli/jgit/commands/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Warning_IndexEntryExists = \u7d22\u5f15\u306b\u306f\u3059\u3067\u306b{0}\u306e\u30a8\u30f3\u30c8\u30ea\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
 MSG_Exception_CannotUpdateHead = {0}\u3078\u306eHEAD\u53c2\u7167\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/Bundle_ja.properties
index bfb4136..19a8b43 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Annotator.variable.branch=\u73fe\u884c\u5206\u5c90\u30e9\u30d9\u30eb\u3092\u8868\u3059
 Annotator.variable.repositoryState=\u30ea\u30dd\u30b8\u30c8\u30ea\u72b6\u614b\u3092\u8868\u3059
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/client/Bundle_ja.properties
index 6318e4d..72e16f2 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/client/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Queued = {0} - \u30ad\u30e5\u30fc
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/options/Bundle_ja.properties
index aaeda28..4cbe730 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 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]"
-
-# 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.
-
-# Contributor(s):
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AnnotationColorsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
 CTL_OptionsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/actions/Bundle_ja.properties
index b01ad44..140d6b1 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_AddAllAction_Name=\u3059\u3079\u3066\u8ffd\u52a0 - \u30ea\u30dd\u30b8\u30c8\u30ea
 LBL_Progress.RefreshingStatuses=\u30d5\u30a1\u30a4\u30eb\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/blame/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/blame/Bundle_ja.properties
index 1638330..88ab73b 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/blame/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/blame/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - commit id
 CTL_AnnotationBar.action.showCommit=\u30b3\u30df\u30c3\u30c8{0}\u306e\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/branch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/branch/Bundle_ja.properties
index d56f8cd..178b23c 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/branch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/branch/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BranchSelector.okButton.text=OK(&O)
 BranchSelector.title=\u5206\u5c90\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/checkout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/checkout/Bundle_ja.properties
index b0ee86b..0d90d4c 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/checkout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/checkout/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CheckoutPathsAction_Name=\u30d5\u30a1\u30a4\u30eb\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&F)...
 LBL_CheckoutPathsAction_PopupName=\u30d5\u30a1\u30a4\u30eb\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8...
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/clone/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/clone/Bundle_ja.properties
index 66caf11..e0d0c36 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/clone/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/clone/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CloneDestinationStep.branch.noBranch=\u5206\u5c90\u306a\u3057
 LBL_Clone.confirmSubmoduleInit.title=\u30b5\u30d6\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u521d\u671f\u5316
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/commit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/commit/Bundle_ja.properties
index 62ca921..dd4b401 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/commit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/commit/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - counted context
 # {1} - current branch
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/conflicts/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/conflicts/Bundle_ja.properties
index c988cff..f5deb8a 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/conflicts/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/conflicts/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #MarkResolvedAction
 LBL_MarkResolvedAction_Name=\u89e3\u6c7a\u3068\u30de\u30fc\u30af(&M)
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/diff/Bundle_ja.properties
index eadb610..256bf76 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/diff/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## DiffTopComponent.java
 ACSN_Diff_Top_Component = \u5dee\u5206
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/fetch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/fetch/Bundle_ja.properties
index 6d8d22a..9577296 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/fetch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/fetch/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_PullAction_mergeButton_text=\u30de\u30fc\u30b8(&M)
 CTL_PullAction_mergeButton_TTtext=\u4f5c\u6210\u3055\u308c\u305f2\u3064\u306e\u30d8\u30c3\u30c9\u3092\u30de\u30fc\u30b8\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/history/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/history/Bundle_ja.properties
index 3287397..c4b5ea6 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/history/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/history/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_SearchIncomingT_Top_Component=\u7740\u4fe1\u306e\u691c\u7d22
 ACSD_SearchOutgoingT_Top_Component=\u7740\u4fe1\u306e\u691c\u7d22
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/ignore/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/ignore/Bundle_ja.properties
index e8a29fe..d0888f9 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/ignore/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/ignore/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_IgnoreAction_Name=\u7121\u8996(&I)
 LBL_IgnoreAction_PopupName=\u7121\u8996
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/init/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/init/Bundle_ja.properties
index ee2d77b..716ebe0 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/init/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/init/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_InitAction.popupName=Git\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u521d\u671f\u5316(&G)...
 LBL_InitAction_Name=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u521d\u671f\u5316(&N)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/menu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/menu/Bundle_ja.properties
index 928d41b..fa931f3 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/menu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/menu/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_MenuItem_BranchMenu=\u5206\u5c90/\u30bf\u30b0(&B)
 CTL_MenuItem_BranchMenu.popup=\u5206\u5c90/\u30bf\u30b0
 CTL_MenuItem_CheckoutMenu=\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8(&K)
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/merge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/merge/Bundle_ja.properties
index 6c3e085..3935803 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/merge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/merge/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Merge.failed.title=\u30de\u30fc\u30b8\u3067\u304d\u307e\u305b\u3093
 LBL_MergeRevisionAction_Name=\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u30de\u30fc\u30b8(&M)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/output/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/output/Bundle_ja.properties
index 1f508e2..14cb926 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/output/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/output/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_OpenOutputAction_Name=\u51fa\u529b\u3092\u958b\u304f(&O)
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/push/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/push/Bundle_ja.properties
index 358a05b..08d26c6 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/push/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/push/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_PushAction.report.outputButton.desc=\u8a73\u7d30\u3092\u542b\u3080\u51fa\u529b\u3092\u958b\u304d\u307e\u3059
 CTL_PushAction.report.outputButton.text=\u51fa\u529b\u3092\u958b\u304f(&O)
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/rebase/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/rebase/Bundle_ja.properties
index d543609..ee10ba4 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/rebase/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/rebase/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_RebaseAction.abortButton.text=\u4e2d\u65ad(&R)
 CTL_RebaseAction.abortButton.TTtext=\u5272\u8fbc\u307f\u3055\u308c\u305f\u30ea\u30d9\u30fc\u30b9\u3092\u4e2d\u65ad
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/repository/Bundle_ja.properties
index 21ed5ad..1473c06 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/repository/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CloseRepositoryAction.name=\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u9589\u3058\u308b
 CTL_OpenRepository_ACSD=\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30d6\u30e9\u30a6\u30b6\u3067\u958b\u304fGit\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u9078\u629e\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/repository/remote/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/repository/remote/Bundle_ja.properties
index c63c994..bf4ca89 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/repository/remote/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/repository/remote/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #RemoveRemoteConfigAction
 LBL_RemoveRemoteConfig.progressName = \u30ea\u30e2\u30fc\u30c8\u69cb\u6210\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/reset/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/reset/Bundle_ja.properties
index 4041ec3..0ac0519 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/reset/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/reset/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ResetAction_Name=\u30ea\u30bb\u30c3\u30c8(&S)...
 LBL_ResetAction_PopupName=\u30ea\u30bb\u30c3\u30c8...
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/revert/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/revert/Bundle_ja.properties
index ac36b84..8cd1dde 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/revert/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/revert/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_RevertCommitAction_Name=\u30b3\u30df\u30c3\u30c8\u3092\u5143\u306b\u623b\u3059(&V)...
 LBL_RevertCommitAction_PopupName = \u30b3\u30df\u30c3\u30c8\u3092\u5143\u306b\u623b\u3059...
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/selectors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/selectors/Bundle_ja.properties
index 9ee3f2f..ed9dcad 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/selectors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/selectors/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2011 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ItemsPanel.titleLabel.toolTipText=\u4f7f\u7528\u53ef\u80fd\u306a\u30ea\u30e2\u30fc\u30c8\u5206\u5c90
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/shelve/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/shelve/Bundle_ja.properties
index ebc942f..7a298ce 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/shelve/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/shelve/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_ShelveChanges_Title=\u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6(&S)...
 # {0} - stash index
 # {1} - stash name
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/stash/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/stash/Bundle_ja.properties
index 49021d6..3f9af43 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/stash/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/stash/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ACSD_SaveStash_Message=\u6700\u7d42\u9000\u907f\u30b3\u30df\u30c3\u30c8\u306e\u30b3\u30df\u30c3\u30c8\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u4e00\u90e8\u3068\u3057\u3066\u4f7f\u7528\u3059\u308b\u9000\u907f\u30e1\u30c3\u30bb\u30fc\u30b8\u3002
 ACSN_SaveStash_Message=\u9000\u907f\u30e1\u30c3\u30bb\u30fc\u30b8
 CTL_SaveStash.okButton.text=\u5909\u66f4\u306e\u9000\u907f(&S)
@@ -19,43 +36,6 @@
 MSG_SaveStash.shelveMessage=git\u306e\u9000\u907f\u3092\u4f7f\u7528\u3059\u308b\u304b\u308f\u308a\u306b\u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6\u3067\u304d\u307e\u3059\u3002
 MSG_SaveStashAction.noModifications=\u9000\u907f\u3059\u308b\u3001\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 MSG_SaveStashAction.progressName=\u30ed\u30fc\u30ab\u30eb\u5909\u66f4\u3092\u9000\u907f\u3057\u3066\u3044\u307e\u3059
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2015, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 SaveStashPanel.lblMessage.text=\u9000\u907f\u30e1\u30c3\u30bb\u30fc\u30b8(&M):
 SaveStashPanel.cbIncludeUncommitted.text=\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u3092\u542b\u3081\u308b(&I)
 SaveStashPanel.cbIncludeUncommitted.TTtext=\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u3082\u9000\u907f\u3057\u3001\u4f5c\u696d\u30c4\u30ea\u30fc\u304b\u3089\u524a\u9664\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/status/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/status/Bundle_ja.properties
index 263443b..72b28f6 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/status/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/status/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_GitStatusTable.popup.initializing=\u521d\u671f\u5316\u3057\u3066\u3044\u307e\u3059...
 CTL_MenuItem_OpenStatusAction=\u30b9\u30c6\u30fc\u30bf\u30b9\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u958b\u304f
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/tag/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/tag/Bundle_ja.properties
index 8c7895e..5921490 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/tag/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/tag/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CreateTagAction_Name=\u30bf\u30b0\u3092\u4f5c\u6210(&T)...
 LBL_CreateTagAction_PopupName = \u30bf\u30b0\u3092\u4f5c\u6210...
diff --git a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/utils/Bundle_ja.properties
index 9918654..2962d5b 100755
--- a/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/utils/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FileSelector.jLabel1.text=\u9078\u629e\u5185\u5bb9\u306f\u8907\u6570\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u5bfe\u8c61\u3067\u3059\u3002\u4f7f\u7528\u3059\u308b\u30d5\u30a9\u30eb\u30c0\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044:
 LBL_FileSelector_Title=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/Bundle_ja.properties
index d8e040e..cc31bc9 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b5\u30dd\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Long-Description=\u30ea\u30e2\u30fc\u30c8Mercurial\u6a5f\u80fd\u3092NetBeans IDE\u306b\u7d71\u5408\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/commands/Bundle_ja.properties
index 901ccc6..0c7d009 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/commands/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_HgCommand.Rebase.failed=\u30ea\u30d9\u30fc\u30b9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/options/Bundle_ja.properties
index 25ba25d..da547bb 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_AnnotationColorsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/resources/Bundle_ja.properties
index 54a9941..b407ff7 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## hg-layer.xml
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/add/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/add/Bundle_ja.properties
index cb1b5bc..e5562c1 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/add/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/add/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Add=\u8ffd\u52a0(&A)
 CTL_PopupMenuItem_Add=\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/annotate/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/annotate/Bundle_ja.properties
index db5b421..4008187 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/annotate/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/annotate/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - changeset id
 CTL_AnnotationBar.action.showCommit=\u30ea\u30d3\u30b8\u30e7\u30f3{0}\u306e\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/branch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/branch/Bundle_ja.properties
index 2b3c4f4..09d3328 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/branch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/branch/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_CloseBranch=\u5206\u5c90\u3092\u9589\u3058\u308b(&L)...
 CTL_MenuItem_CreateBranch=\u5206\u5c90\u3092\u4f5c\u6210(&B)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/clone/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/clone/Bundle_ja.properties
index b2efcf3..50a3001 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/clone/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/clone/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_CloneExternal=\u4ed6\u3092\u30af\u30ed\u30fc\u30f3(&R)...
 # {0} - repository folder name
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/commit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/commit/Bundle_ja.properties
index 80970dc..b4882dd 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/commit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/commit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ##CommitAction.java
 CTL_MenuItem_Commit = \u30b3\u30df\u30c3\u30c8(&M)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/create/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/create/Bundle_ja.properties
index 915edc0..e10841f 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/create/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/create/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_MenuItem_Create=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u521d\u671f\u5316(&N)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/diff/Bundle_ja.properties
index 79e19a5..a78b5d8 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/diff/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## DiffTopComponent.java
 ACSN_Diff_Top_Component = \u5dee\u5206
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/ignore/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/ignore/Bundle_ja.properties
index b6318c2..86858c2 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/ignore/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/ignore/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Ignore=\u7121\u8996\u3092\u5207\u66ff\u3048(&I)
 ##IgnoreAction.java
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/log/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/log/Bundle_ja.properties
index 1f79730..918010c 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/log/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/log/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Action.ViewCurrent.name=\u73fe\u5728\u306e\u8868\u793a
 ##LogAction.java
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/menu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/menu/Bundle_ja.properties
index 7f7f82b..156ff1f 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/menu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/menu/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_MenuItem_BranchMenu=\u5206\u5c90/\u30bf\u30b0(&B)
 CTL_MenuItem_BranchMenu.popupName=\u5206\u5c90/\u30bf\u30b0
 CTL_MenuItem_ConflictsMenu=\u7af6\u5408(&F)
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/merge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/merge/Bundle_ja.properties
index efc16db..291a719 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/merge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/merge/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Merge=\u5909\u66f4\u3092\u30de\u30fc\u30b8(&M)
 ##MergeAction.java
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/properties/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/properties/Bundle_ja.properties
index 534f724..2053e00 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/properties/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/properties/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Properties=\u30d7\u30ed\u30d1\u30c6\u30a3(&O)...
 CTL_PropertiesDialog_Title=Hg\u30d7\u30ed\u30d1\u30c6\u30a3\u30fb\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/pull/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/pull/Bundle_ja.properties
index fcc91e1..2a12699 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/pull/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/pull/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_FetchLocal=\u30d5\u30a7\u30c3\u30c1(&F)
 # {0} - repository folder name
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/push/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/push/Bundle_ja.properties
index ec6dda7..6f13310 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/push/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/push/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_PushBranchLocal=\u73fe\u5728\u306e\u5206\u5c90\u3092\u30d7\u30c3\u30b7\u30e5(&S)
 # {0} - repository folder name
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/queues/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/queues/Bundle_ja.properties
index 96acb80..0b865d1 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/queues/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/queues/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_QCreatePatch=\u30d1\u30c3\u30c1\u306e\u4f5c\u6210(&C)...
 CTL_MenuItem_QDiff=\u5dee\u5206(&D)
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rebase/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rebase/Bundle_ja.properties
index 307976a..9607a90 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rebase/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rebase/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_RebaseAction=\u30ea\u30d9\u30fc\u30b9(&R)...
 CTL_RebaseAction.abortButton.text=\u4e2d\u65ad(&R)
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/repository/Bundle_ja.properties
index 060efa0..551a13e 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/repository/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_HeadRevisionPicker_Cancel=\u53d6\u6d88
 ACSD_HeadRevisionPicker_Select=\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_ja.properties
index e92c94d..294878c 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ##BackoutAction.java
 CTL_MenuItem_Backout = \u30d0\u30c3\u30af\u30a2\u30a6\u30c8(&B)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/shelve/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/shelve/Bundle_ja.properties
index 6a89ac8..2335dd2 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/shelve/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/shelve/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ShelveChanges_Title = \u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6(&S)...
 CTL_ShelveChanges_Title_Context = \u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6(&S)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/status/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/status/Bundle_ja.properties
index b00047a..eb4d024 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/status/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/status/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Versioning_TopComponent_Title = Mercurial
 CTL_Versioning_TopComponent_MultiTitle = Mercurial - {0} {1}
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/tag/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/tag/Bundle_ja.properties
index a178157..989c105 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/tag/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/tag/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_CreateTag=\u30bf\u30b0\u3092\u4f5c\u6210(&T)...
 CTL_MenuItem_ManageTags=\u30bf\u30b0\u306e\u7ba1\u7406(&G)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/update/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/update/Bundle_ja.properties
index 357f501..3874174 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/update/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/update/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_MarkResolved=\u89e3\u6c7a\u3068\u3057\u3066\u30de\u30fc\u30af(&M)
 CTL_MenuItem_Resolve=\u7af6\u5408\u3092\u89e3\u6c7a(&F)
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/wizards/Bundle_ja.properties
index cf9bc06..7440ced 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 repositoryPanel.Name=Mercurial\u30ea\u30dd\u30b8\u30c8\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/util/Bundle_ja.properties
index 139f80f..2469419 100755
--- a/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_WARN_NO_VIEW_TEXT = hg: \u4e0d\u660e\u306a\u30b3\u30de\u30f3\u30c9'view'\n .hgrc\u306e\u62e1\u5f35\u30bb\u30af\u30b7\u30e7\u30f3\u306b"hgext.hgk="\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u304b?
 MSG_WARN_HGK_NOT_FOUND_TEXT = sh: hgk\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\n hgk\u306e\u5834\u6240\u304c\u30d1\u30b9\u306b\u5b58\u5728\u3057\u307e\u3059\u304b?
diff --git a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/api/Bundle_ja.properties
index 93f5238..7ec7c07 100755
--- a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/api/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d6\u30ea\u30c3\u30b8API\u306b\u5bfe\u3059\u308b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
 OpenIDE-Module-Name=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d6\u30ea\u30c3\u30b8API\u306b\u5bfe\u3059\u308b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/common/Bundle_ja.properties
index 2b34ac7..8586e8c 100755
--- a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/common/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_CommitDialog_Title = \u30b3\u30df\u30c3\u30c8 - {0}
diff --git a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/projects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/projects/Bundle_ja.properties
index d8752d7..6c36172 100755
--- a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/projects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/projects/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CHECKOUT_ACSD_Completed_Dialog = \u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3067\u306f\u3001SVN\u304b\u3089\u6b63\u3057\u304f\u30bd\u30fc\u30b9\u3092\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8\u3057\u305f\u3042\u3068\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/status/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/status/Bundle_ja.properties
index f39aebe..26f60de 100755
--- a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/status/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning-api/remotefs-versioning-api/org/netbeans/modules/remotefs/versioning/util/status/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #VCSStatusNode
 LBL_Path.DisplayName=\u30d1\u30b9
diff --git a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning/remotefs-versioning/org/netbeans/modules/remotefs/versioning/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning/remotefs-versioning/org/netbeans/modules/remotefs/versioning/Bundle_ja.properties
index 38be248..bdda78d 100755
--- a/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning/remotefs-versioning/org/netbeans/modules/remotefs/versioning/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/remotefs-versioning/remotefs-versioning/org/netbeans/modules/remotefs/versioning/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u306f\u5b9f\u88c5\u306e\u4f9d\u5b58\u6027\u304c\u3042\u308a\u307e\u3059:\n- versioning.core\u306b\u5bfe\u3057\u3066\n- \u30ea\u30e2\u30fc\u30c8FS\u306b\u5bfe\u3057\u3066
 OpenIDE-Module-Name=\u30ea\u30e2\u30fc\u30c8FS\u304b\u3089\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u306e\u30d6\u30ea\u30c3\u30b8
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/Bundle_ja.properties
index cdcaf87..8d34243 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - checkout folder
 # {1} - number of contained modified files
 MSG_FileStatusCache.cacheTooBig.checkoutWithModifications={0}: {1}\u500b\u306e\u5909\u66f4
@@ -10,43 +27,6 @@
 # {0} - number of changes
 # {1} - checkouts with the highest number of modifications
 MSG_FileStatusCache.cacheTooBig.text=Subversion\u306b\u306f\u3001\u30ed\u30fc\u30ab\u30eb\u3067\u5909\u66f4\u3055\u308c\u305f{0}\u500b\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u542b\u307e\u308c\u307e\u3059\u3002\u3053\u306e\u3088\u3046\u306a\u591a\u6570\u306e\u672a\u30b3\u30df\u30c3\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308b\u3068\u3001\u4f5c\u696d\u30b3\u30d4\u30fc\u3078\u306e\u30a2\u30af\u30bb\u30b9\u6642\u306b\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u308c\u3089\u306e\u5909\u66f4\u3092\u30b3\u30df\u30c3\u30c8\u3059\u308b\u304b\u5143\u306b\u623b\u3059\u3053\u3068\u3092\u691c\u8a0e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8: {1}
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b5\u30dd\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Long-Description=\u30ea\u30e2\u30fc\u30c8Subversion
 OpenIDE-Module-Name=\u30ea\u30e2\u30fc\u30c8Subversion
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/client/Bundle_ja.properties
index 91b7d10..4b08174 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/client/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Action_Cancel=\u53d6\u6d88
 FileChooser.SvnExecutables.desc=SVN\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/client/cli/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/client/cli/Bundle_ja.properties
index 6e6f18b..aab36f1 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/client/cli/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/client/cli/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_Error.diffSummaryWithCLI=\u30b3\u30de\u30f3\u30c9\u884c\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u4f7f\u7528\u3057\u305f\u30ea\u30d3\u30b8\u30e7\u30f3\u30fb\u30c4\u30ea\u30fc\u9593\u306e\u5dee\u5206\u306e\u53d6\u5f97\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\nSVNKit\u307e\u305f\u306fJavaHL\u306b\u5207\u308a\u66ff\u3048\u3066\u304f\u3060\u3055\u3044\u3002
 MSG_Error.diffSummaryWithCLI.CLIforced=\u30b3\u30de\u30f3\u30c9\u884c\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u4f7f\u7528\u3057\u305f\u30ea\u30d3\u30b8\u30e7\u30f3\u30fb\u30c4\u30ea\u30fc\u9593\u306e\u5dee\u5206\u306e\u53d6\u5f97\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 MSG_Error.reintegrateBranchWithCLI=\u30b3\u30de\u30f3\u30c9\u884c\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u4f7f\u7528\u3057\u305f\u5206\u5c90\u306e\u518d\u7d71\u5408\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\nSVNKit\u307e\u305f\u306fJavaHL\u306b\u5207\u308a\u66ff\u3048\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/config/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/config/Bundle_ja.properties
index 637b32e..621418c 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/config/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/config/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ## ProxySelector.java
 BK2000=\u4f7f\u7528\u3055\u308c\u305fNetBeans HTTP\u30d7\u30ed\u30ad\u30b7
 BK2002=\u691c\u51fa\u3055\u308c\u305f\u76f4\u63a5\u63a5\u7d9a
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/notifications/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/notifications/Bundle_ja.properties
index b1bf1fe..a154681 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/notifications/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/notifications/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_NotificationBubble_Description=\u6b21\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f:<br>{0}<a href="{1}">\u30ea\u30d3\u30b8\u30e7\u30f3\u306e\u8a73\u7d30\u3092\u8868\u793a</a><br><a href="{2}">\u30ea\u30e2\u30fc\u30c8\u3067\u306e\u5909\u66f4\u306e\u5dee\u5206</a><br>
 MSG_NotificationBubble_DeleteDescription=\u6b21\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f:<br>{0}<a href="{1}">\u30ea\u30e2\u30fc\u30c8\u3067\u306e\u5909\u66f4\u306e\u5dee\u5206</a><br>
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/options/Bundle_ja.properties
index 7b0eb41..3fe4fda 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/options/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AnnotationColorsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
 CTL_OptionsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/resources/Bundle_ja.properties
index ec314f5..96bd0d0 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## manifest mf
 OpenIDE-Module-Name=Subversion
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/actions/Bundle_ja.properties
index b5d3cb6..1c9fe99 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_SVNCommands_Label=Subversion
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/blame/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/blame/Bundle_ja.properties
index da6b4e5..df9464d 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/blame/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/blame/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AnnotationSubstitute = \u8a08\u7b97\u4e2d...
 CTL_AnnotationFailed = \u4f7f\u7528\u4e0d\u53ef
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/browser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/browser/Bundle_ja.properties
index 2fab47a..b1fdb93 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/browser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/browser/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_BrowserAction=\u53c2\u7167
 
 LBL_RepositoryBrowser=\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30d5\u30a9\u30eb\u30c0\u3092\u53c2\u7167:
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/checkout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/checkout/Bundle_ja.properties
index ecf063b..ede6260 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/checkout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/checkout/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CheckoutAction_Name=\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8(&K)...
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/commit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/commit/Bundle_ja.properties
index bfd6655..6ae0211 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/commit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/commit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Commit=\u30b3\u30df\u30c3\u30c8(&M)...
 CTL_MenuItem_Commit_Context=\u30b3\u30df\u30c3\u30c8(&M)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/copy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/copy/Bundle_ja.properties
index 361195d..b1124f3 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/copy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/copy/Bundle_ja.properties
@@ -1,46 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_Merge_ReintegrateBranch=\u6a5f\u80fd\u30d6\u30e9\u30f3\u30c1\u306e\u518d\u7d71\u5408
 CTL_Merge_ReintegrateBranchDesc=\u307e\u3060\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306b\u306a\u3044\u6a5f\u80fd\u5206\u5c90\u306e\u3059\u3079\u3066\u306e\u5909\u66f4\u3092\u30de\u30fc\u30b8\u3057\u307e\u3059\u3002
-# 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.
 CTL_Title = \u30b3\u30d4\u30fc/\u5207\u66ff\u3048/\u30de\u30fc\u30b8
 ## CreateCopyAction.java
 CTL_MenuItem_Copy = \u30b3\u30d4\u30fc\u5148(&C)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/diff/Bundle_ja.properties
index c81a148..855be2b 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/diff/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## DiffAction.java
 CTL_MenuItem_Diff = \u5dee\u5206(&D)
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/export/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/export/Bundle_ja.properties
index dee7668..f937bdc 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/export/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/export/Bundle_ja.properties
@@ -1,45 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#~
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ExportDialog_Title=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
 CTL_MenuItem_Export=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8(&E)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/history/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/history/Bundle_ja.properties
index e0448eb..41c4e76 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/history/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/history/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Action.ViewCurrent.name=\u73fe\u5728\u306e\u8868\u793a
 CTL_MenuItem_SearchHistory = \u5c65\u6b74\u3092\u691c\u7d22(&H)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/ignore/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/ignore/Bundle_ja.properties
index 0e9cde9..a623437 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/ignore/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/ignore/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Ignore = \u7121\u8996(&I)
 CTL_MenuItem_Ignore_Context = \u7121\u8996(&I)
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/menu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/menu/Bundle_ja.properties
index 5e6084d..6bd15df 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/menu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/menu/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_MenuItem_CopyMenu=\u30b3\u30d4\u30fc(&C)
 CTL_MenuItem_CopyMenu.popup=\u30b3\u30d4\u30fc
 CTL_MenuItem_DiffMenu=\u5dee\u5206(&D)
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/project/Bundle_ja.properties
index 0db0a4d..091bb2e 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #CheckinAction.java
 CTL_PopupMenuItem_Import=Subversion\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30a4\u30f3\u30dd\u30fc\u30c8(&S)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/properties/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/properties/Bundle_ja.properties
index b408b1d..65924ac 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/properties/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/properties/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_VersioningInfoAction=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u60c5\u5831(&G)
 CTL_PropertiesAction=\u30d7\u30ed\u30d1\u30c6\u30a3(&O)
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/relocate/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/relocate/Bundle_ja.properties
index 17c99b3..6c72241 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/relocate/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/relocate/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Relocate_Dialog_Title = \u518d\u914d\u7f6e
 CTL_Relocate_Title=\u518d\u914d\u7f6e(&R)...
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/repository/Bundle_ja.properties
index 89b30b6..6a13dcd 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/repository/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## RepositoryPanel.java
 BK0001=Subversion\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5834\u6240\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044:
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/search/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/search/Bundle_ja.properties
index 72bcb7c..3e11cd4 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/search/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/search/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # {0} - resource URL
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/status/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/status/Bundle_ja.properties
index c5421fa..3e445b9 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/status/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/status/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Versioning_TopComponent_Title = Subversion
 CTL_Versioning_TopComponent_MultiTitle = Subversion - {0} ({1})
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/update/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/update/Bundle_ja.properties
index 32a38a8..8bc1a42 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/update/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/update/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## UpdateAction.java
 CTL_MenuItem_Update = HEAD\u306b\u66f4\u65b0(&U)
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wcadmin/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wcadmin/Bundle_ja.properties
index 95945df..4d389d6 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wcadmin/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wcadmin/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Cleanup_Title=\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7(&C)
 CTL_Cleanup_Title_Context=\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7(&C)
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/Bundle_ja.properties
index 3a9ffc1..9f0370b 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CheckoutAction=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/checkoutstep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/checkoutstep/Bundle_ja.properties
index 3be42bd..578a8d3 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/checkoutstep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/checkoutstep/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ## WorkdirStep.java
 BK2024=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b\u30d5\u30a9\u30eb\u30c0
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/importstep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/importstep/Bundle_ja.properties
index 9ab4d13..e2037d5 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/importstep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/importstep/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ## ImportStep.java
 BK2014=\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30d5\u30a9\u30eb\u30c0\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
 
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/repositorystep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/repositorystep/Bundle_ja.properties
index b67fa7f..45cde87 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/repositorystep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/repositorystep/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ## RepositoryStep.java
 BK2018=Subversion\u30ea\u30dd\u30b8\u30c8\u30ea
 BK2019=\u30c6\u30b9\u30c8\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30d7\u30ed\u30ad\u30b7\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/urlpatternstep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/urlpatternstep/Bundle_ja.properties
index 091f0df..bab13a6 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/urlpatternstep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/ui/wizards/urlpatternstep/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_Name=\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30d5\u30a9\u30eb\u30c0
 
 CTL_URLPattern_RepositoryHint=\u30d5\u30a9\u30eb\u30c0(\u5206\u5c90/\u30bf\u30b0)\u304a\u3088\u3073\u30d5\u30a9\u30eb\u30c0\u540d\u306e\u8a73\u7d30\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/util/Bundle_ja.properties
index 0245c9f..8815def 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/util/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # Sample ResourceBundle properties file
 
 MSG_too_old_WC=\u4f5c\u696d\u4e2d\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3\u3067\u4f5c\u6210\u3055\u308c\u305f\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\nSVN\u30af\u30e9\u30a4\u30a2\u30f3\u30c81.5.0\u4ee5\u964d\u3092\u4f7f\u7528\u3057\u3066\u3001\u30d5\u30a1\u30a4\u30eb\u3092\u3082\u3046\u4e00\u5ea6\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/versioning/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/versioning/util/Bundle_ja.properties
index ea762fa..13a46da 100755
--- a/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/versioning/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/versioning/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_OpenInEditor = \u958b\u304f
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/apisupport-restsample/apisupport-restsample/org/netbeans/modules/apisupport/restsample/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/apisupport-restsample/apisupport-restsample/org/netbeans/modules/apisupport/restsample/Bundle_ja.properties
index 77d17c6..a64698d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/apisupport-restsample/apisupport-restsample/org/netbeans/modules/apisupport/restsample/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/apisupport-restsample/apisupport-restsample/org/netbeans/modules/apisupport/restsample/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_CreateProjectStep=\u540d\u524d\u3068\u5834\u6240
 OpenIDE-Module-Name=REST\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u30b5\u30f3\u30d7\u30eb
 Templates/Project/Samples/ApiSupport/RESTSampleProject.zip=\u30b5\u30f3\u30d7\u30ebREST\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/enterprise/apisupport-restsample/apisupport-restsample/org/netbeans/modules/apisupport/restsample/RESTSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/apisupport-restsample/apisupport-restsample/org/netbeans/modules/apisupport/restsample/RESTSampleDescription_ja.html
index 31e4a61..b873007 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/apisupport-restsample/apisupport-restsample/org/netbeans/modules/apisupport/restsample/RESTSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/apisupport-restsample/apisupport-restsample/org/netbeans/modules/apisupport/restsample/RESTSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/Bundle_ja.properties
index c0dda22..34791d5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Amazon Elastic Beanstalk
 
 MSG_DEPLOY_AUTH=\u8a8d\u8a3c\u4e2d...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/serverplugin/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/serverplugin/Bundle_ja.properties
index a1f2584..9279e13 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/serverplugin/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/serverplugin/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AmazonDeploymentFactory.displayName=Amazon Beanstalk
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/Bundle_ja.properties
index 93d5a8d..fb9b65b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Amazon_Node_Name=Amazon Beanstalk
 Amazon_Node_Short_Description=Amazon Beanstalk
diff --git a/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle_ja.properties
index 2f4cd77..a0f7765 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/cloud-amazon/cloud-amazon/org/netbeans/modules/cloud/amazon/ui/serverplugin/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 AmazonJ2EEServerWizardComponent.endNameLabel.text=\u74b0\u5883\u540d:
 AmazonJ2EEServerWizardComponent.envFullURLLabel.text=\ AmazonJ2EEServerWizardComponent.containerLabel.text=\u30b3\u30f3\u30c6\u30ca\u30fb\u30bf\u30a4\u30d7:
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/cloud-common/cloud-common/org/netbeans/modules/cloud/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/cloud-common/cloud-common/org/netbeans/modules/cloud/common/Bundle_ja.properties
index c742d8c..2c5766f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/cloud-common/cloud-common/org/netbeans/modules/cloud/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/cloud-common/cloud-common/org/netbeans/modules/cloud/common/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30af\u30e9\u30a6\u30c9\u5171\u901a
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/cloud-common/cloud-common/org/netbeans/modules/cloud/common/spi/support/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/cloud-common/cloud-common/org/netbeans/modules/cloud/common/spi/support/ui/Bundle_ja.properties
index a741794..f30e27f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/cloud-common/cloud-common/org/netbeans/modules/cloud/common/spi/support/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/cloud-common/cloud-common/org/netbeans/modules/cloud/common/spi/support/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CloudResourcesWizardComponent.jLabel1.text=<html>\u3053\u308c\u3089\u306e\u30ea\u30bd\u30fc\u30b9\u306f\u30af\u30e9\u30a6\u30c9\u3067\u691c\u51fa\u3055\u308c\u3001\u81ea\u52d5\u7684\u306bIDE\u3067\u4f7f\u7528\u53ef\u80fd\u306b\u306a\u3063\u3066\u3044\u307e\u3059:
 CloudResourcesWizardComponent.none=\u4f7f\u7528\u53ef\u80fd\u306a\u3082\u306e\u304c\u3042\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/enterprise/el-lexer/el-lexer/org/netbeans/modules/el/lexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/el-lexer/el-lexer/org/netbeans/modules/el/lexer/Bundle_ja.properties
index 16a0747..dd30a3f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/el-lexer/el-lexer/org/netbeans/modules/el/lexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/el-lexer/el-lexer/org/netbeans/modules/el/lexer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u5f0f\u8a00\u8a9e\u30ec\u30af\u30b5\u30fc
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/enterprise/el-lexer/el-lexer/org/netbeans/modules/el/lexer/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/el-lexer/el-lexer/org/netbeans/modules/el/lexer/resources/Bundle_ja.properties
index 38504b8..3e61164 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/el-lexer/el-lexer/org/netbeans/modules/el/lexer/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/el-lexer/el-lexer/org/netbeans/modules/el/lexer/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 text/x-el=\u5f0f\u8a00\u8a9e
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_ja.properties
index bb5cdb2..c750466 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/actions/Bundle_ja.properties
index 77b893b..03fa908 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/actions/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # remove server action
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/nodes/Bundle_ja.properties
index 868bea6..4ee06c6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/nodes/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 TXT_GlassfishPreludeInstanceNode=GlassFish v3 Prelude
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/nodes/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/nodes/actions/Bundle_ja.properties
index f78d492..d5f190c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/nodes/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/nodes/actions/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_UndeployAction=\u30a2\u30f3\u30c7\u30d7\u30ed\u30a4(&U)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/status/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/status/Bundle_ja.properties
index e74b408..548c56d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/status/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/status/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AuthFailureStateListener.message=<html>{0}\u30b9\u30c6\u30fc\u30bf\u30b9\u306e\u78ba\u8a8d\u4e2d\u306b\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u6709\u52b9\u306a\u7ba1\u7406\u8005\u8cc7\u683c\u60c5\u5831\u3092\u63d0\u4f9b\u3057\u3066\u304f\u3060\u3055\u3044\u3002</html>
 AuthFailureStateListener.error.exception=\u30b5\u30fc\u30d0\u30fc\u30fb\u30b9\u30c6\u30fc\u30bf\u30b9\u306e\u78ba\u8a8d\u4e2d\u306b\u4f8b\u5916\u304c\u30b9\u30ed\u30fc\u3055\u308c\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/ui/Bundle_ja.properties
index 18066a0..ec42ec6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Common=\u5171\u901a
 LBL_EnableCometSupport=Comet\u30b5\u30dd\u30fc\u30c8\u3092\u6709\u52b9\u5316(&E)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/wizards/Bundle_ja.properties
index de2cb29..6ac490a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-common/glassfish-common/org/netbeans/modules/glassfish/common/wizards/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 #title for wizard server location panel
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/Bundle_ja.properties
index 6422a35..1074054 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Display-Category=Java EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/Bundle_ja.properties
index c655230..a20aebb 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # driver deploy helper
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/config/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/config/Bundle_ja.properties
index 10f8078..b7a16e1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/config/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-eecommon/glassfish-eecommon/org/netbeans/modules/glassfish/eecommon/api/config/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # Error messages used by glassfish configuration for binding api's.
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/Bundle_ja.properties
index c419c17..1f21610 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
 OpenIDE-Module-Long-Description=Java\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30fb\u30d9\u30fc\u30b9\u306e\u30c6\u30af\u30ce\u30ed\u30b8\u3092\u4f7f\u7528\u3057\u305fJava Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u958b\u767a\u306e\u305f\u3081\u306eGlassFish Server\u30b3\u30fc\u30c9\u30d9\u30fc\u30b9\u306b\u57fa\u3065\u3044\u305f\u30b5\u30fc\u30d0\u30fc\u7528\u30d7\u30e9\u30b0\u30a4\u30f3\u3002<p>\u8a73\u7d30\u306f\u3001\u6b21\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044:<li> GlassFish\u30b3\u30df\u30e5\u30cb\u30c6\u30a3: <a href="http://www.glassfish.org">http://www.glassfish.org</a></li><li> Oracle GlassFish Server\u304a\u3088\u3073\u88fd\u54c1\u30b5\u30dd\u30fc\u30c8: <a href="http://www.oracle.com/us/products/middleware/application-server/oracle-glassfish-server/index.html">http://www.oracle.com/us/products/middleware/application-server/oracle-glassfish-server/index.html</a></li></p>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ide/Bundle_ja.properties
index fa81d3e..60f9572 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ide/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_START_SERVER_FAILED_FNF={0}\u30b5\u30fc\u30d0\u30fc\u3092\u8d77\u52d5\u3067\u304d\u307e\u305b\u3093\u3002\u8d77\u52d5jar\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 MSG_START_SERVER_FAILED_PD={0}\u30b5\u30fc\u30d0\u30fc\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u8d77\u52d5\u30d7\u30ed\u30bb\u30b9\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/templates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/templates/Bundle_ja.properties
index e91b373..da86468 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/templates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/templates/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/WebLogicResources=WebLogic
 Templates/WebLogicResources/weblogicDD=WebLogic\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/templates/weblogicDD_ja.html b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/templates/weblogicDD_ja.html
index 9b71afd..0f89790 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/templates/weblogicDD_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/templates/weblogicDD_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ui/Bundle_ja.properties
index 6687164..e1de5d9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-javaee/glassfish-javaee/org/netbeans/modules/glassfish/javaee/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DebugPortQuery.debugPortLable.text=<html><body>\u30ea\u30e2\u30fc\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u3067\u306f\u30c7\u30d0\u30c3\u30b0\u30fb\u30dd\u30fc\u30c8\u304c\u672a\u5b9a\u7fa9\u3067\u3059\u3002\u3069\u306e\u30dd\u30fc\u30c8\u306b\u30c7\u30d0\u30c3\u30ac\u3092\u30a2\u30bf\u30c3\u30c1\u3057\u307e\u3059\u304b?</body></html>
 DebugPortQuery.noAskCheck.text=<html><body>\u4ee5\u964d\u3001\u78ba\u8a8d\u3057\u306a\u3044\u3002<i><small>(\u30b5\u30fc\u30d0\u30fc\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u5909\u66f4\u3002)</small></i></body></html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/glassfish-tooling/glassfish-tooling/org/netbeans/modules/glassfish/tooling/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/glassfish-tooling/glassfish-tooling/org/netbeans/modules/glassfish/tooling/Bundle_ja.properties
index f5f2118..d1a9a91 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/glassfish-tooling/glassfish-tooling/org/netbeans/modules/glassfish/tooling/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/glassfish-tooling/glassfish-tooling/org/netbeans/modules/glassfish/tooling/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Name=GlassFish Tooling
diff --git a/netbeans-l10n-zip/src/ja/enterprise/hibernateweb/hibernateweb/org/netbeans/modules/hibernateweb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/hibernateweb/hibernateweb/org/netbeans/modules/hibernateweb/Bundle_ja.properties
index 8dd9554..5e9a1ad 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/hibernateweb/hibernateweb/org/netbeans/modules/hibernateweb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/hibernateweb/hibernateweb/org/netbeans/modules/hibernateweb/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
 OpenIDE-Module-Long-Description=Web\u304a\u3088\u3073Java EE\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30b5\u30dd\u30fc\u30c8\u3059\u308b\u305f\u3081\u306eHibernate\u30b5\u30dd\u30fc\u30c8\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u62e1\u5f35\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/hibernateweb/hibernateweb/org/netbeans/modules/hibernateweb/framework/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/hibernateweb/hibernateweb/org/netbeans/modules/hibernateweb/framework/Bundle_ja.properties
index 361912e..ef76b1a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/hibernateweb/hibernateweb/org/netbeans/modules/hibernateweb/framework/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/hibernateweb/hibernateweb/org/netbeans/modules/hibernateweb/framework/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_HibernateConfigurationPanel_Name=Hibernate\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u69cb\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ant/j2ee-ant/org/netbeans/modules/j2ee/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ant/j2ee-ant/org/netbeans/modules/j2ee/ant/Bundle_ja.properties
index f1a1707..2a266ba 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ant/j2ee-ant/org/netbeans/modules/j2ee/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ant/j2ee-ant/org/netbeans/modules/j2ee/ant/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=J2EE\u30b5\u30fc\u30d0\u30fcAnt\u30bf\u30b9\u30af
 OpenIDE-Module-Display-Category=Web
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ant/netbeans/ant/nblib/j2ee-ant/org/netbeans/modules/j2ee/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ant/netbeans/ant/nblib/j2ee-ant/org/netbeans/modules/j2ee/ant/Bundle_ja.properties
index 19cabbc..872fc64 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ant/netbeans/ant/nblib/j2ee-ant/org/netbeans/modules/j2ee/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ant/netbeans/ant/nblib/j2ee-ant/org/netbeans/modules/j2ee/ant/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_FileNotFound=\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 MSG_ProfierNotFound=\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/ejbjar/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/ejbjar/Bundle_ja.properties
index 46eaf31..620ab25 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/ejbjar/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/ejbjar/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=EJB JAR API
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Short-Description=EJB JAR\u958b\u767a\u30b5\u30dd\u30fc\u30c8\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u306eAPI\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/ejbjar/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/ejbjar/project/ui/Bundle_ja.properties
index a4fe99f..5624208 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/ejbjar/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/ejbjar/project/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Nodes in logical view
 LBL_Node_ResourceNode=\u30b5\u30fc\u30d0\u30fc\u30fb\u30ea\u30bd\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/spi/ejbjar/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/spi/ejbjar/support/Bundle_ja.properties
index 15ca5a0..b41fdab 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/spi/ejbjar/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-api-ejbmodule/j2ee-api-ejbmodule/org/netbeans/modules/j2ee/spi/ejbjar/support/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Node_ConfigFiles=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb
 MSG_MissingMetadata=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u307e\u305f\u306f\u6ce8\u91c8\u306b\u30e1\u30bf\u30c7\u30fc\u30bf\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u305f\u3081\u3001\u30ea\u30bd\u30fc\u30b9\u304c\u4f5c\u6210\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/Bundle_ja.properties
index c557ba1..b9ec6b1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8(CAR)\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 OpenIDE-Module-Display-Category=Java EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/api/Bundle_ja.properties
index 1e660f7..e0b0ad5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # NOTE TO TRANSLATORS: This is a folder name, do not use odd characters:
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/Bundle_ja.properties
index 091785b..5a17a48 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Actions
 LBL_Properties_Action=\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle_ja.properties
index 1e467db..ca4cf4e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #AntArtifactChooser
 LBL_AACH_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-emptyProject_ja.html
index 739c313..3f36b2a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-emptyProject_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-importProject_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-importProject_ja.html
index b56c3de..319a8dd 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-importProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-importProject_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop_ja.html
index b7c4141..358af7e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/resources/desktop_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle_ja.properties
index 7ff5ba2..69e9b96 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #System file system
 Templates/Project/J2EE/emptyCar.xml=\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/wsclient/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/wsclient/Bundle_ja.properties
index 38e680b..99d6292 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/wsclient/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-clientproject/j2ee-clientproject/org/netbeans/modules/j2ee/clientproject/wsclient/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_ErrorSavingOnWSClientAdd=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8''{0}''\u306e\u8ffd\u52a0\u5f8c\u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4fdd\u5b58\u30a8\u30e9\u30fc\u3002\n\u30e1\u30c3\u30bb\u30fc\u30b8: {1}\n
 MSG_ErrorSavingOnWSClientRemove=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8''{0}''\u306e\u524a\u9664\u5f8c\u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4fdd\u5b58\u30a8\u30e9\u30fc\u3002\n\u30e1\u30c3\u30bb\u30fc\u30b8: {1}\n
 MSG_ErrorSavingGlobalProperties=\u30b5\u30fc\u30d3\u30b9''{0}''\u306ewscompile.tools.classpath\u306e\u8ffd\u52a0\u5f8c\u306b\u6c4e\u7528\u30d7\u30ed\u30d1\u30c6\u30a3\u4fdd\u5b58\u30a8\u30e9\u30fc\n\u30e1\u30c3\u30bb\u30fc\u30b8: {1}\n
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/Bundle_ja.properties
index 7c6be8d..5bc7a30 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=J2EE\u30b5\u30dd\u30fc\u30c8\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 OpenIDE-Module-Display-Category=Java EE
 OpenIDE-Module-Short-Description=J2EE\u306e\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/ui/Bundle_ja.properties
index 45d77d7..bea5a53 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-common/j2ee-common/org/netbeans/modules/j2ee/common/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # BrokenServerSupport
 LBL_Resolve_Missing_Server_Title=\u4e0d\u8db3\u3057\u3066\u3044\u308b\u30b5\u30fc\u30d0\u30fc\u306e\u554f\u984c\u3092\u89e3\u6c7a
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-core/j2ee-core/org/netbeans/api/j2ee/core/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-core/j2ee-core/org/netbeans/api/j2ee/core/Bundle_ja.properties
index 5e8de42..d0ac584 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-core/j2ee-core/org/netbeans/api/j2ee/core/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-core/j2ee-core/org/netbeans/api/j2ee/core/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 J2EE13.displayName=J2EE 1.3
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-core/j2ee-core/org/netbeans/modules/j2ee/core/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-core/j2ee-core/org/netbeans/modules/j2ee/core/resources/Bundle_ja.properties
index b09187e..f885394 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-core/j2ee-core/org/netbeans/modules/j2ee/core/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-core/j2ee-core/org/netbeans/modules/j2ee/core/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java EE\u30b3\u30a2API
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd-webservice/j2ee-dd-webservice/org/netbeans/modules/j2ee/dd/webservice/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd-webservice/j2ee-dd-webservice/org/netbeans/modules/j2ee/dd/webservice/Bundle_ja.properties
index 3dea279..21ebea1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd-webservice/j2ee-dd-webservice/org/netbeans/modules/j2ee/dd/webservice/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd-webservice/j2ee-dd-webservice/org/netbeans/modules/j2ee/dd/webservice/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u306eAPI
 OpenIDE-Module-Display-Category=Java EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/Bundle_ja.properties
index 4eb5dc9..577d965 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## web/ddapi/manifest.mf
 OpenIDE-Module-Name=J2EE DD API
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/api/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/api/common/Bundle_ja.properties
index dbd5e77..19ecf51 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/api/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/api/common/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/api/web/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/api/web/Bundle_ja.properties
index fb3a048..4edb2ab 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/api/web/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/api/web/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## web/ddapi/manifest.mf
 OpenIDE-Module-Name=DD API
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/application/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/application/Bundle_ja.properties
index d9a5064..4a71be5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/application/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/application/Bundle_ja.properties
@@ -1,46 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CommonDDAccess
 # 0 = method name, 1 = parameters, 2 = exception message
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/client/Bundle_ja.properties
index d9a5064..4a71be5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/client/Bundle_ja.properties
@@ -1,46 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CommonDDAccess
 # 0 = method name, 1 = parameters, 2 = exception message
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/common/Bundle_ja.properties
index 91f9ad2..81de106 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/common/Bundle_ja.properties
@@ -1,46 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CommonDDAccess
 # 0 = method name, 1 = parameters, 2 = exception message
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/ejb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/ejb/Bundle_ja.properties
index d9a5064..4a71be5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/ejb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/ejb/Bundle_ja.properties
@@ -1,46 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CommonDDAccess
 # 0 = method name, 1 = parameters, 2 = exception message
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/web/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/web/Bundle_ja.properties
index d9a5064..4a71be5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/web/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-dd/j2ee-dd/org/netbeans/modules/j2ee/dd/impl/web/Bundle_ja.properties
@@ -1,46 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CommonDDAccess
 # 0 = method name, 1 = parameters, 2 = exception message
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/Bundle_ja.properties
index 44e1177..af72ef7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Name=Java EE\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u30fb\u30ed\u30fc\u30c0\u30fc
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/app/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/app/Bundle_ja.properties
index 5a9c316..36122ee 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/app/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/app/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9(&S)
 # DDDataLoader
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/catalog/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/catalog/Bundle_ja.properties
index 5912c88..db93555 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/catalog/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/catalog/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_EnterpriseCatalog=\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u30fb\u30ab\u30bf\u30ed\u30b0
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/client/Bundle_ja.properties
index c2c9a16..a1c8eb7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/client/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9
 # DDDataLoader
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/Bundle_ja.properties
index 7df78d4..0207c71 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DDDataLoader
 LBL_loaderName=EJB JAR\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u30fb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle_ja.properties
index 2da4afd..877bd5d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/common/xmlutils/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 TXT_parser=XML\u30d1\u30fc\u30b5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/ejb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/ejb/Bundle_ja.properties
index 11be509..51afcbc 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/ejb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/ejb/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DDDataLoader
 LBL_loaderName=EJB JAR\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u30fb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/multiview/Bundle_ja.properties
index 08a64c0..f8c3d1b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/multiview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DDDataNode
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/multiview/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/multiview/ui/Bundle_ja.properties
index f56a419..4f1fb24 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/multiview/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/multiview/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #BrowseFolders
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/Bundle_ja.properties
index 955a60a..817c238 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle_ja.properties
index 69f0a28..9a4b9ed 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ddloaders/j2ee-ddloaders/org/netbeans/modules/j2ee/ddloaders/web/multiview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Module manifest localization
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/Bundle_ja.properties
index 0b984f3..2b7466a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=\u3044\u304f\u3064\u304b\u306e\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30e9\u30c3\u30d7\u3067\u304d\u308b\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30fc\u30ab\u30a4\u30d6\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u3059\u3002EAR\u30d5\u30a1\u30a4\u30eb\u3068\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u4f7f\u7528\u306b\u3088\u308a\u3001\u3044\u304f\u3064\u304b\u306e\u540c\u3058\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u4f7f\u7528\u3059\u308b\u591a\u6570\u306e\u7570\u306a\u308bJ2EE\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u30a2\u30bb\u30f3\u30d6\u30eb\u3067\u304d\u307e\u3059\u3002\n- 1\u3064\u4ee5\u4e0a\u306eWeb\u30e2\u30b8\u30e5\u30fc\u30eb\n- 1\u3064\u4ee5\u4e0a\u306eEJB\u30e2\u30b8\u30e5\u30fc\u30eb\n- 1\u3064\u4ee5\u4e0a\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\n- \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u5fc5\u8981\u3068\u3059\u308b\u8ffd\u52a0\u306eJAR\u30d5\u30a1\u30a4\u30eb\n- \u4e0a\u8a18\u306e\u4efb\u610f\u306e\u7d44\u307f\u5408\u308f\u305b
 OpenIDE-Module-Name=\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3(EAR)\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/Bundle_ja.properties
index 4052ea2..b2317c0 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Actions
 LBL_SetViewAction_Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d3\u30e5\u30fc\u3092\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/actions/Bundle_ja.properties
index 3a340c5..5228079 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_AddModuleAction=Java EE\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u8ffd\u52a0(&D)...
 LBL_ModuleSelectorTitle=Java EE\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle_ja.properties
index 3549e77..2fc13fe 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Customizer provider
 #{0} Name of the project
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject_ja.html
index da1d9ff..a96b8b4 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/completeProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-emptyProject_ja.html
index e660b63..c302b62 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-emptyProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject_ja.html
index 74a64e3..efc09f5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear-importProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear_ja.html
index 71ef91e..f9ed720 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/resources/ear_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle_ja.properties
index e1803ae..cdd91fc 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-earproject/j2ee-earproject/org/netbeans/modules/j2ee/earproject/ui/wizards/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 #System file system
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/Bundle_ja.properties
index 7f77160..a459482 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Enterprise JavaBeans\u30b3\u30a2
 OpenIDE-Module-Display-Category=Java EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/action/Bundle_ja.properties
index 43a0083..e142725 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/action/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 server.resource.exists.message=JNDI\u540d"{0}"\u306e\u30c7\u30fc\u30bf\u30fb\u30bd\u30fc\u30b9\u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u306b\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/Bundle_ja.properties
index 3705e5a..68b2a37 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Duplicate_Field_Name=\u30d5\u30a3\u30fc\u30eb\u30c9{0}\u306f\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle_ja.properties
index 8e5370e..0a53683 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # MultiTargetChooserPanelGUI
 LBL_JavaTargetChooserPanelGUI_Name=\u540d\u524d\u3068\u5834\u6240
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/Bundle_ja.properties
index d755127..6233380 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/cmp/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/J2EE/EJB21/CmpPrimaryKey.java=CMP\u4e3b\u30ad\u30fc\u30fb\u30af\u30e9\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/Bundle_ja.properties
index c9cf5f9..2411229 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/J2EE/ejbJarXml=\u6a19\u6e96\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml_ja.html
index 1d84cef..1189268 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/dd/ejbJarXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/Bundle_ja.properties
index 65d349a..878440d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/entity/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # templates for user editing
 Templates/J2EE/EJB21/BmpEjbClass.java=BMP\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3EJB\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle_ja.properties
index 45b40d3..9244248 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Persistence/ejbFacade=\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30af\u30e9\u30b9\u306e\u30bb\u30c3\u30b7\u30e7\u30f3Bean
 Templates/J2EE/ejbFacade=\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30af\u30e9\u30b9\u306e\u30bb\u30c3\u30b7\u30e7\u30f3Bean
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/ejbFacade_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/ejbFacade_ja.html
index 2bc1141..d934548 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/ejbFacade_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/ejbFacade_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/Bundle_ja.properties
index 977ce18..aacff0c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/mdb/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACPTableModel.lbl.property.name=\u30d7\u30ed\u30d1\u30c6\u30a3\u540d
 ACPTableModel.lbl.property.value=\u30d7\u30ed\u30d1\u30c6\u30a3\u5024
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle_ja.properties
index adafcf0..7cb78f2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # templates for user editing
 Templates/J2EE/EJB21/SessionEjbClass.java=\u30bb\u30c3\u30b7\u30e7\u30f3EJB\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/naming/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/naming/Bundle_ja.properties
index 4d3479f..441ca03 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/naming/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/naming/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AdvancedOption_DisplayName=EJB\u547d\u540d
 AdvancedOption_Tooltip=Enterprise JavaBeans\u306e\u540d\u524d\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/patterns/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/patterns/Bundle_ja.properties
index af87722..4d3a3c3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/patterns/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/patterns/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/J2EE/CachingServiceLocator.java=\u30ad\u30e3\u30c3\u30b7\u30f3\u30b0\u30fb\u30b5\u30fc\u30d3\u30b9\u30fb\u30ed\u30b1\u30fc\u30bf
 Templates/J2EE/ServiceLocator.java=\u30b5\u30fc\u30d3\u30b9\u30fb\u30ed\u30b1\u30fc\u30bf
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/Bundle_ja.properties
index 3e92a3f..2844612 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 #System file system
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase_ja.html
index 550408a..4260436 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CMPDatabase_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator_ja.html
index e8c0a76..481966a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/CachingServiceLocator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB_ja.html
index 953c41a..00bfdea 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/EntityEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB_ja.html
index 4bafd66..b52eace 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/MessageEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator_ja.html
index 4f71958..23e1b9d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/ServiceLocator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB_ja.html
index 9f57afe..aee5924 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/SessionEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/TimerSessionEJB_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/TimerSessionEJB_ja.html
index 0680799..0862ba9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/TimerSessionEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/resources/TimerSessionEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/Bundle_ja.properties
index 4c7ff79..b883b4a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Actions API
 LBL_PromoteToRemote=\u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u306b\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/Bundle_ja.properties
index 1751345..f8e6617 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CMPFields=CMP\u30d5\u30a3\u30fc\u30eb\u30c9
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/Bundle_ja.properties
index 9a1e3a6..879604b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/shared/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_RemoteMethods=\u30ea\u30e2\u30fc\u30c8\u30fb\u30e1\u30bd\u30c3\u30c9
 LBL_LocalMethods=\u30ed\u30fc\u30ab\u30eb\u30fb\u30e1\u30bd\u30c3\u30c9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/Bundle_ja.properties
index 35057d5..ebac9d9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejbcontainer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Nodes API
 LBL_WebServices=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/Bundle_ja.properties
index 05484d0..f48f0a2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbcore/j2ee-ejbcore/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/entries/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 HINT_UseDbAction=\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u30fb\u30e1\u30bd\u30c3\u30c9\u3068\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u5ba3\u8a00\u3092\u8ffd\u52a0\u3057\u307e\u3059
 LBL_EJBActionGroup=Enterprise JavaBeans (EJB)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/Bundle_ja.properties
index 21b6043..fd177d4 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Enterprise JavaBeans (EJB)\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 OpenIDE-Module-Display-Category=Java EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/api/Bundle_ja.properties
index 5e0156c..f6a28ad 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NAME_src.dir=\u30bd\u30fc\u30b9\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8
 NAME_test.src.dir=\u30c6\u30b9\u30c8\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/Bundle_ja.properties
index e9bfeb1..9cd022a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Actions
 LBL_SetViewAction_Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d3\u30e5\u30fc\u3092\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle_ja.properties
index 49856d4..a8ad923 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CustomizerDialog
 LBL_Customizer_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3 - {0}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejb-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejb-emptyProject_ja.html
index d1d49bc..b9de509 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejb-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejb-emptyProject_ja.html
@@ -1,41 +1,21 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
-
-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.
-
-Contributor(s):
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
 -->
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejb-importProject_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejb-importProject_ja.html
index 624f866..c859c38 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejb-importProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejb-importProject_ja.html
@@ -1,41 +1,21 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
-
-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.
-
-Contributor(s):
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
 -->
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjar_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjar_ja.html
index aed1278..10a7d73 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjar_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/resources/ejbjar_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle_ja.properties
index 930b18d..a13803e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbjarproject/j2ee-ejbjarproject/org/netbeans/modules/j2ee/ejbjarproject/ui/wizards/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 #System file system
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbrefactoring/j2ee-ejbrefactoring/org/netbeans/modules/j2ee/ejbrefactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbrefactoring/j2ee-ejbrefactoring/org/netbeans/modules/j2ee/ejbrefactoring/Bundle_ja.properties
index 2d73247..0b2abb3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbrefactoring/j2ee-ejbrefactoring/org/netbeans/modules/j2ee/ejbrefactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbrefactoring/j2ee-ejbrefactoring/org/netbeans/modules/j2ee/ejbrefactoring/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=EJB\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
 
 TXT_EjbJarGeneralWarning=\u6b21\u306e\u5834\u6240\u306bejb-jar.xml\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f: {0}\u3002\u53ef\u80fd\u306a\u53c2\u7167\u306f\u5909\u66f4\u3055\u308c\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/Bundle_ja.properties
index b6da82f..e22d536 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/fixes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/fixes/Bundle_ja.properties
index e83a797..ed37a2b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/fixes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/fixes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/resources/Bundle_ja.properties
index d70dc2c..700a61f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Hints categories and subcategories
 org-netbeans-modules-java-hints/rules/hints/javaee=Java EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/rules/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/rules/Bundle_ja.properties
index 44a90f2..a5bb22e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/rules/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-ejbverification/j2ee-ejbverification/org/netbeans/modules/j2ee/ejbverification/rules/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AnnotationPostContruct.description=@PostConstruct\u6ce8\u91c8\u306e\u4f7f\u7528\u65b9\u6cd5\u3092\u78ba\u8a8d\u3057\u307e\u3059\u3002\u623b\u308a\u5024\u3001\u30af\u30e9\u30b9\u5f53\u305f\u308a\u306e\u5358\u4e00\u6027\u3001\u30d1\u30e9\u30e1\u30fc\u30bf\u306a\u3069\u3002
 AnnotationPostContruct.display.name=\u6ce8\u91c8@PostConstruct
 AnnotationPostContruct_thrown_checked_exceptions=@PostConstruct\u3068\u3044\u3046\u6ce8\u91c8\u304c\u4ed8\u3044\u305f\u30e1\u30bd\u30c3\u30c9\u3067\u306f\u78ba\u8a8d\u6e08\u4f8b\u5916\u3092\u30b9\u30ed\u30fc\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-genericserver/j2ee-genericserver/org/netbeans/modules/j2ee/genericserver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-genericserver/j2ee-genericserver/org/netbeans/modules/j2ee/genericserver/Bundle_ja.properties
index e505b02..c17303c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-genericserver/j2ee-genericserver/org/netbeans/modules/j2ee/genericserver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-genericserver/j2ee-genericserver/org/netbeans/modules/j2ee/genericserver/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_DisplayName=\u6c4e\u7528\u30b5\u30fc\u30d0\u30fc
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-genericserver/j2ee-genericserver/org/netbeans/modules/j2ee/genericserver/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-genericserver/j2ee-genericserver/org/netbeans/modules/j2ee/genericserver/resources/Bundle_ja.properties
index 0842505..5f48e66 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-genericserver/j2ee-genericserver/org/netbeans/modules/j2ee/genericserver/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-genericserver/j2ee-genericserver/org/netbeans/modules/j2ee/genericserver/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u6c4e\u7528J2EE\u30b5\u30fc\u30d0\u30fc\u30fb\u30d7\u30e9\u30b0\u30a4\u30f3
 OpenIDE-Module-Display-Category=Java EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/Bundle_ja.properties
index 1929520..de1a4f8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/Bundle_ja.properties
index 522f366..64b9f8b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_invalidCP=\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30fb\u30d1\u30b9\u5024\u3092\u4fee\u6b63: {0}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/ds/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/ds/Bundle_ja.properties
index af24389..0ed9e2e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/ds/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/ds/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_datasourcesXmlCannotParse=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb{0}\u306f\u89e3\u6790\u3067\u304d\u307e\u305b\u3093 - \u5909\u66f4\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/mdb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/mdb/Bundle_ja.properties
index 9c15708..5428d57 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/mdb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/config/mdb/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_msgdestXmlCannotParse=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb{0}\u306f\u89e3\u6790\u3067\u304d\u307e\u305b\u3093 - \u5909\u66f4\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/customizer/Bundle_ja.properties
index e3033e1..ec9ac04 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Customizer
 TXT_Tab_Classes=\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/Bundle_ja.properties
index ec7a183..6ab6877 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 TITLE_JBOSS_LIBRARY=JBoss J2EE 1.4
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/ui/Bundle_ja.properties
index 8618f02..2eb661c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/ide/ui/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/nodes/Bundle_ja.properties
index 2f0758d..bd461cb 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/nodes/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/nodes/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/nodes/actions/Bundle_ja.properties
index c5b0380..813f871 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/nodes/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/nodes/actions/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_ShowAdminGUIAction=\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb\u3092\u8868\u793a(&A)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/resources/Bundle_ja.properties
index 58a4b0d..03fc309 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-jboss4/j2ee-jboss4/org/netbeans/modules/j2ee/jboss4/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Name=JBoss\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30fc\u30d0\u30fc
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-kit/j2ee-kit/org/netbeans/modules/j2ee/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-kit/j2ee-kit/org/netbeans/modules/j2ee/kit/Bundle_ja.properties
index 8a9b75b..ba48663 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-kit/j2ee-kit/org/netbeans/modules/j2ee/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-kit/j2ee-kit/org/netbeans/modules/j2ee/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
 OpenIDE-Module-Name=EJB\u304a\u3088\u3073EAR
 OpenIDE-Module-Short-Description=EJB\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3001EAR\u30d5\u30a1\u30a4\u30eb\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-platform/j2ee-platform/org/netbeans/modules/j2ee/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-platform/j2ee-platform/org/netbeans/modules/j2ee/platform/Bundle_ja.properties
index 71b2da3..8e5c522 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-platform/j2ee-platform/org/netbeans/modules/j2ee/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-platform/j2ee-platform/org/netbeans/modules/j2ee/platform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module description
 OpenIDE-Module-Name=Java EE\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/Bundle_ja.properties
index 201cc70..da99974 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/AnnotationOverrideInterceptor_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/AnnotationOverrideInterceptor_ja.html
index f107dc3..445867e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/AnnotationOverrideInterceptor_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/AnnotationOverrideInterceptor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ApplicationScopedResources_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ApplicationScopedResources_ja.html
index d814aa7..c59c6ac 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ApplicationScopedResources_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ApplicationScopedResources_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/AsyncRequest_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/AsyncRequest_ja.html
index 41c42ea..cf297bc 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/AsyncRequest_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/AsyncRequest_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/CustomerCMP_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/CustomerCMP_ja.html
index d580acf..f89a05d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/CustomerCMP_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/CustomerCMP_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/EjbContainer_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/EjbContainer_ja.html
index 33ec579..1d28d93 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/EjbContainer_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/EjbContainer_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/EmbeddedGlassfish_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/EmbeddedGlassfish_ja.html
index e3df308..c393d8c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/EmbeddedGlassfish_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/EmbeddedGlassfish_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/HelloJAXWS_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/HelloJAXWS_ja.html
index 13b0112..5971b9a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/HelloJAXWS_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/HelloJAXWS_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/InterceptorStateless_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/InterceptorStateless_ja.html
index a98e1bd..88e093f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/InterceptorStateless_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/InterceptorStateless_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpaCrud_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpaCrud_ja.html
index 532f96d..d4d70a9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpaCrud_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpaCrud_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpa_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpa_ja.html
index 6b68492..72cb09c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpa_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/JsfJpa_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/LotteryAnnotation_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/LotteryAnnotation_ja.html
index 671d998..ee8e083 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/LotteryAnnotation_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/LotteryAnnotation_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/PetCatalog_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/PetCatalog_ja.html
index 5f7d32a..34e07af 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/PetCatalog_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/PetCatalog_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ScrumToys_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ScrumToys_ja.html
index 6d540b2..0a49d4e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ScrumToys_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ScrumToys_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ServletStateless_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ServletStateless_ja.html
index 79a236e..62bd8b0 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ServletStateless_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/ServletStateless_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/SimpleJAXB_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/SimpleJAXB_ja.html
index bf9e127..2ebfe55 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/SimpleJAXB_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/SimpleJAXB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/WebJpa_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/WebJpa_ja.html
index 463d0ac..026fc80 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/WebJpa_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-samples/j2ee-samples/org/netbeans/modules/j2ee/samples/descriptions/WebJpa_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/api/restricted/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/api/restricted/Bundle_ja.properties
index d6d91ea..4e0e3f6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/api/restricted/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/api/restricted/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CreateJMS = createJmsResource
 LBL_JNDI=JNDI\u540d
 LBL_URL=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9URL
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/appsrvapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/appsrvapi/Bundle_ja.properties
index 10c881f..c65e4ab 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/appsrvapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/appsrvapi/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/editors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/editors/Bundle_ja.properties
index 1bcdd11..776f43b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/editors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/editors/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 #IsolationLevelEditor
 LBL_driver_default=JDBC\u30c9\u30e9\u30a4\u30d0\u306e\u30c7\u30d5\u30a9\u30eb\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/editors/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/editors/ui/Bundle_ja.properties
index 1d3cadb..2d55d00 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/editors/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/editors/ui/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 # Required bundle strings form j2eeeditor
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/j2ee/mbmapping/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/j2ee/mbmapping/Bundle_ja.properties
index c2a8818..0052e7e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/j2ee/mbmapping/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/j2ee/mbmapping/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 Msg_SolarisShmem=Windows\u4ee5\u5916\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u3001debug-options\u306etransport\u5024\u306bshmem\u3092\u8a2d\u5b9a\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002\ndt_socket\u306b\u623b\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/Bundle_ja.properties
index 90e47d2..8cf921b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # ResourceBundle properties file
 ## JDBC Connection Pool
 LBL_conn_valid_method=\u63a5\u7d9a\u306e\u691c\u67fb\u65b9\u6cd5
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/Bundle_ja.properties
index afaff75..56247f2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/Bundle_ja.properties
@@ -1,47 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 GlassfishRecognizer=GlassFish\u30ea\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb
-#
-# 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.
-#
 # Datasystems API
 #PROP_myProp=<name of my property>
 #HINT_myProp=<description of my property>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_ja.properties
index f6a0019..1cfcb28 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # WizardDescriptor
 # Dialog title:
 TITLE_x_of_y={0}/{1}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/ConnectionPoolWizardInfo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/ConnectionPoolWizardInfo_ja.html
index f23cf64..3165dc1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/ConnectionPoolWizardInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/ConnectionPoolWizardInfo_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/DataSourceWizardInfo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/DataSourceWizardInfo_ja.html
index 07c8c69..dd0ca77 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/DataSourceWizardInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/DataSourceWizardInfo_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMailWizardInfo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMailWizardInfo_ja.html
index 7af7b74..b1a821c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMailWizardInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMailWizardInfo_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMessageWizardInfo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMessageWizardInfo_ja.html
index 2b1a1b7..35f7fe3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMessageWizardInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/JavaMessageWizardInfo_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PersistenceWizardInfo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PersistenceWizardInfo_ja.html
index c8ef5de..c5c078d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PersistenceWizardInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PersistenceWizardInfo_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/WizardInformation_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/WizardInformation_ja.html
index 69c06c1..1bf8f30 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/WizardInformation_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/WizardInformation_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-dd/j2ee-sun-dd/org/netbeans/modules/j2ee/sun/dd/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-dd/j2ee-sun-dd/org/netbeans/modules/j2ee/sun/dd/Bundle_ja.properties
index 76e442f..34fa9f9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-dd/j2ee-sun-dd/org/netbeans/modules/j2ee/sun/dd/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-dd/j2ee-sun-dd/org/netbeans/modules/j2ee/sun/dd/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## web/ddapi/manifest.mf
 # API stands for Application Programming Interface... it is not a date/time spec
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-dd/j2ee-sun-dd/org/netbeans/modules/j2ee/sun/dd/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-dd/j2ee-sun-dd/org/netbeans/modules/j2ee/sun/dd/api/Bundle_ja.properties
index 4ece34f..b5d01a9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-dd/j2ee-sun-dd/org/netbeans/modules/j2ee/sun/dd/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-dd/j2ee-sun-dd/org/netbeans/modules/j2ee/sun/dd/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/Bundle_ja.properties
index a11e36f..498daf4 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Copyright 1997-2011 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # DD stands for deployment descriptor... it is not a date/time specifier
 OpenIDE-Module-Name=sun-* DD\u30ed\u30fc\u30c0\u30fc
 OpenIDE-Module-Display-Category=Java EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/editor/Bundle_ja.properties
index 7d6bee1..98e1426 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/editor/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_parser_annotation_err_description="!FIXME \u7121\u52b9\u306a xml"
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/appclient/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/appclient/Bundle_ja.properties
index f9226a8..4b689b2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/appclient/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/appclient/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_JWSHeader=Java Web Start\u306e\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/common/Bundle_ja.properties
index 20c4440..75d135b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/common/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_Remove=\u9664\u53bb
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/ejb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/ejb/Bundle_ja.properties
index b1bf54b..b40b686 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/ejb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/ejb/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # Multiview panel headers (EJB)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/jms/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/jms/Bundle_ja.properties
index 5f5b2c0..922a003 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/jms/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/jms/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_MessageDestinationGroupHeader=\u30e1\u30c3\u30bb\u30fc\u30b8\u5b9b\u5148
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/tables/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/tables/Bundle_ja.properties
index e51207e..3720817 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/tables/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/tables/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 jLabel2.text=\u540d\u524d:
 
 jTextField1.text=\u8ab0\u304b\u306e\u540d\u524d
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/web/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/web/Bundle_ja.properties
index d54c1c4..057bf7e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/web/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/web/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 ACSN_ModuleDetails=\u5171\u901a\u306e\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/webservice/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/webservice/Bundle_ja.properties
index f7c7472..35d5da1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/webservice/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/ddloaders/multiview/webservice/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_WebServiceGroupHeader=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/Bundle_ja.properties
index 9359e9e..2cb7d6d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/Bundle_ja.properties
@@ -1,50 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
-# Sample ResourceBundle properties file
-# arg 0 is the charset canonical name and arg 1 is a comma-separated list of
-# aliases.  If the "allow choosing of aliases" option is selected, this format
-# is not used.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_UnnamedCharset=[\u540d\u524d\u672a\u5b9a\u306e\u6587\u5b57\u30bb\u30c3\u30c8]
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/Bundle_ja.properties
index da6d798..d100b87 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # DD stands for deployment descriptor... it is not a date/time specifier
 OpenIDE-Module-Name=sun-* DD GUI\u30a8\u30c7\u30a3\u30bf
 OpenIDE-Module-Display-Category=Java EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/Bundle_ja.properties
index 98e1ed1..290a47c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # General Customizers ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/Bundle_ja.properties
index 14fff1a..991af99 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # Sample ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/ejbmodule/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/ejbmodule/Bundle_ja.properties
index d0815f9..2770d87 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/ejbmodule/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/ejbmodule/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 # EjbJar Customizer main parent panel
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/other/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/other/Bundle_ja.properties
index a5cad21..5ece0bd 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/other/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/other/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 # Sun Application Client Customizer main parent panel
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/webapp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/webapp/Bundle_ja.properties
index c4d56d9..ed30a6b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/webapp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/webapp/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # WebApp Customizers ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/webservice/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/webservice/Bundle_ja.properties
index 1346523..7b28204 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/webservice/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/customizers/webservice/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/Bundle_ja.properties
index 123a637..a84da6f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/SunResources/sunDD=GlassFish\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/sunDD_ja.html b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/sunDD_ja.html
index 8fa20b7..bebfc45 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/sunDD_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/share/configbean/templates/sunDD_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/validation/Bundle_ja.properties
index 7d140ca..9e64489 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-sun-ddui/j2ee-sun-ddui/org/netbeans/modules/j2ee/sun/validation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #{0} - Object Type(File/Property)
 #{1} - Object Name
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_ja.properties
index 20ba215..78a2a4f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_BeginsOn=\u958b\u59cb\u65e5
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/config/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/config/Bundle_ja.properties
index 63a0e2c..422ca91 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/config/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/config/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_invalidCP=\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30fb\u30d1\u30b9\u5024\u3092\u4fee\u6b63: {0}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/dd/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/dd/model/Bundle_ja.properties
index 6579c5c..0be4991 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/dd/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/dd/model/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_FailedToCreateConfigFolder=WebLogic\u30b5\u30fc\u30d0\u30fc\u56fa\u6709\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u7528{0}\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/deploy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/deploy/Bundle_ja.properties
index 6fba695..eb2bc47 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/deploy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/deploy/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Deployment_Failed=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30e1\u30c3\u30bb\u30fc\u30b8: {0}
 MSG_Deployment_Completed=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/j2ee/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/j2ee/Bundle_ja.properties
index f62a9c8..1aa8ee5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/j2ee/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/j2ee/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # {0} - server version
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/optional/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/optional/Bundle_ja.properties
index e8c67cd..8c647a4 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/optional/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/optional/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 TXT_ioWindowTitle=BEA WebLogic Server\u5165\u51fa\u529b
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_ja.properties
index 7c65a8d..7889f59 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/Bundle_ja.properties
index b4def9c..2d51e8c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Failed_Authentication_Title=\u30b5\u30fc\u30d0\u30fc\u8a8d\u8a3c\u5931\u6557
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/nodes/Bundle_ja.properties
index 2fbd106..886d622 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/nodes/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_ConnectionFailed=\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u73fe\u5728\u7a3c\u50cd\u3057\u3066\u3044\u306a\u3044\u304b\u3001\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/nodes/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/nodes/actions/Bundle_ja.properties
index 79170c2..c8f822d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/nodes/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/nodes/actions/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_RefreshModulesAction=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/wizard/Bundle_ja.properties
index 4c94c30..0da8b66 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/ui/wizard/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 ERR_INVALID_SERVER_VERSION=Oracle WebLogic Server\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeapis/j2eeapis/org/netbeans/modules/j2eeapis/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeapis/j2eeapis/org/netbeans/modules/j2eeapis/Bundle_ja.properties
index f817313..c5b59b1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeapis/j2eeapis/org/netbeans/modules/j2eeapis/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeapis/j2eeapis/org/netbeans/modules/j2eeapis/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module description
 OpenIDE-Module-Name=J2EE\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u304a\u3088\u3073\u7ba1\u7406API
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/config/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/config/Bundle_ja.properties
index c7fdda7..f512873 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/config/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/config/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_NoTargetSelected=\u30e2\u30b8\u30e5\u30fc\u30eb\u7528\u306e\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle_ja.properties
index 7416aa7..b440a23 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/devmodules/api/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_DeployFailed=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30a8\u30e9\u30fc: {0}\n\u8a73\u7d30\u306f\u3001\u30b5\u30fc\u30d0\u30fc\u306e\u30ed\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/Bundle_ja.properties
index d010e88..76d8442 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Module manifest localization
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/bridge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/bridge/Bundle_ja.properties
index f8f52e3..67e0667 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/bridge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/bridge/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Properties=\u30d7\u30ed\u30d1\u30c6\u30a3(&P)
 LBL_ErgonomicsAction=\u30a8\u30eb\u30b4\u30ce\u30df\u30af\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/projects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/projects/Bundle_ja.properties
index e166cf7..e0cf1f5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/projects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/projects/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_TargetServerNotFound=\u4e0d\u6b63\u306a\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fcID {0}
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/sharability/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/sharability/Bundle_ja.properties
index 51b35f7..96fbae3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/sharability/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/sharability/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ServerLibraryTypeProvider.typeName=\u30b5\u30fc\u30d0\u30fc\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/Bundle_ja.properties
index 95e6166..ab9cfdb 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_ja.properties
index 8b444f0..7c5e334 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_CancelButton=\u53d6\u6d88\u3057\u30dc\u30bf\u30f3
 ACSD_ConfirmButton=\u300c\u540d\u524d\u306e\u5909\u66f4\u300d\u30dc\u30bf\u30f3
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/Bundle_ja.properties
index 787dc26..a408a11 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_ASIW_Title=\u30b5\u30fc\u30d0\u30fc\u30fb\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/plugins/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/plugins/api/Bundle_ja.properties
index ff73884..eccfe52 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/plugins/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/j2eeserver/j2eeserver/org/netbeans/modules/j2ee/deployment/plugins/api/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 TXT_J2eeLibraryType=Java EE\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-api/javaee-api/org/netbeans/modules/javaee/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-api/javaee-api/org/netbeans/modules/javaee/api/Bundle_ja.properties
index ed7f7be..0977ab1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-api/javaee-api/org/netbeans/modules/javaee/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-api/javaee-api/org/netbeans/modules/javaee/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java EE
 OpenIDE-Module-Long-Description=JavaEE 6 API (\u3059\u3079\u3066\u306eAPI\u304a\u3088\u3073Web\u30d7\u30ed\u30d5\u30a1\u30a4\u30ebAPI)\u3092\u63d0\u4f9b\u3059\u308b\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30e9\u30c3\u30d1\u30fc
 OpenIDE-Module-Name=Java EE 6 API\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/Bundle_ja.properties
index 1231777..c509142 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Sample ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/Bundle_ja.properties
index 5535592..706cdbf 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Bean\u691c\u8a3c
 Templates/Bean_Validation=Bean\u691c\u8a3c
 Templates/Bean_Validation/Constraint.java=\u691c\u8a3c\u306e\u5236\u7d04
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/Constraint_ja.html b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/Constraint_ja.html
index 1d5e302..cc749a8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/Constraint_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/Constraint_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/ValidationConfiguration_ja.html b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/ValidationConfiguration_ja.html
index f4fcfbd..bc282c1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/ValidationConfiguration_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/ValidationConfiguration_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/ValidationMapping_ja.html b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/ValidationMapping_ja.html
index 9948121..8a7c8c1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/ValidationMapping_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/ValidationMapping_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/WebInfo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/WebInfo_ja.html
index ba66687..5c87586 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/WebInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-beanvalidation/javaee-beanvalidation/org/netbeans/modules/javaee/beanvalidation/resources/WebInfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/Bundle_ja.properties
index 0dc5959..7bfbe32 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java EE\u5171\u6709\u30d7\u30ed\u30b8\u30a7\u30af\u30c8API
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/Bundle_ja.properties
index 2a223bd..282c118 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_Dialog_Title=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u3092\u7d9a\u884c\u3057\u307e\u3059\u304b?
 MSG_WhitelistViolations=\u30c7\u30d7\u30ed\u30a4\u4e2d\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u3001\u30db\u30ef\u30a4\u30c8\u30fb\u30ea\u30b9\u30c8\u9055\u53cd\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u3092\u7d9a\u884c\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/Bundle_ja.properties
index b0859b7..f9fc6f4 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ProjectBuiltAutomatically=<html><b>\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u4fdd\u5b58\u6642\u306b\u81ea\u52d5\u7684\u306b\u30b5\u30fc\u30d0\u30fc\u306b\u518d\u30c7\u30d7\u30ed\u30a4\u3055\u308c\u307e\u3059\u3002</b><br>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092IDE\u3067\u5b9f\u884c\u307e\u305f\u306f\u30c7\u30d0\u30c3\u30b0\u3059\u308b\u305f\u3081\u306b\u30d3\u30eb\u30c9\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002<br><br>JAR\u30d5\u30a1\u30a4\u30eb\u3084WAR\u30d5\u30a1\u30a4\u30eb\u306a\u3069\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u914d\u5e03\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u3092<br>\u30d3\u30eb\u30c9\u307e\u305f\u306f\u518d\u30d3\u30eb\u30c9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u5834\u5408\u306f\u300c\u6d88\u53bb\u3057\u3066\u30d3\u30eb\u30c9\u300d\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002<br>\u81ea\u52d5\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u6a5f\u80fd\u3092\u7121\u52b9\u306b\u3057\u3066\u300c\u30d3\u30eb\u30c9\u300d\u30b3\u30de\u30f3\u30c9\u3092\u30a2\u30af\u30c6\u30a3\u30d6\u306b\u3059\u308b\u306b\u306f\u3001<br>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3\u3067\u300c\u4fdd\u5b58\u6642\u306b\u30c7\u30d7\u30ed\u30a4\u300d\u3092\u7121\u52b9\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 BTN_ProjectProperties=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/Bundle_ja.properties
index 73e5bdd..eff1fbf 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_No_Server_Selected=<html>\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u304b\u3001\u524a\u9664\u3055\u308c\u3066\u3044\u307e\u3059\u3002<br>\u300c\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u53f3\u30af\u30ea\u30c3\u30af\u3057\u3001<br><b>\u300c\u4e0d\u8db3\u3057\u3066\u3044\u308b\u30b5\u30fc\u30d0\u30fc\u306e\u554f\u984c\u3092\u89e3\u6c7a\u300d</b>\u3092\u9078\u629e\u3057\u3066\u3001\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002</html>
 MSG_Server_No_Debugging=<html>\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u3067\u306f\u3001\u30c7\u30d0\u30c3\u30b0\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002<br>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3\u3067\u3001<b>\u5225\u306e\u30b5\u30fc\u30d0\u30fc\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044</b>\u3002</html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/logicalview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/logicalview/Bundle_ja.properties
index 7382c00..543c54d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/logicalview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/logicalview/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ERR_ProjectReadOnly=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306f\u8aad\u53d6\u308a\u5c02\u7528\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle_ja.properties
index cb0d956..7573e77 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_ProjectFolderList=ProjectFolderList
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/dd/ear/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/dd/ear/Bundle_ja.properties
index 33331a1..92d904e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/dd/ear/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/dd/ear/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/J2EE/ApplicationXml=\u6a19\u6e96\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf
 LBL_Name=\u30d5\u30a1\u30a4\u30eb\u540d:
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/dd/ear/applicationXml_ja.html b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/dd/ear/applicationXml_ja.html
index 2e9a40c..3f7afbe 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/dd/ear/applicationXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/dd/ear/applicationXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/hints/Bundle_ja.properties
index c430155..49a578d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-project/javaee-project/org/netbeans/modules/javaee/project/hints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OptionalEE7APIsHint_Description=Java EE 7\u4ed5\u69d8\u3067\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u306a\u308b\u30c6\u30af\u30ce\u30ed\u30b8\u306eAPI\u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u3068\u304d\u306b\u30e6\u30fc\u30b6\u30fc\u306b\u8b66\u544a\u3057\u307e\u3059\u3002\u3053\u308c\u3089\u306eAPI\u306f\u975e\u63a8\u5968\u3067\u306f\u306a\u3044\u305f\u3081\u4f7f\u7528\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u3059\u304c\u3001\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u306a\u308b\u305f\u3081\u306b\u5c06\u6765\u306eJava EE 7\u6e96\u62e0\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u306f\u5229\u7528\u3067\u304d\u306a\u304f\u306a\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
 OptionalEE7APIsHint_DisplayName=\u3053\u306eAPI\u306f\u3001Java EE 7\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u306f\u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u306a\u308b\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-resources/javaee-resources/org/netbeans/modules/javaee/resources/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-resources/javaee-resources/org/netbeans/modules/javaee/resources/resources/Bundle_ja.properties
index 0f7f3c1..f1d4613 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-resources/javaee-resources/org/netbeans/modules/javaee/resources/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-resources/javaee-resources/org/netbeans/modules/javaee/resources/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java EE
 OpenIDE-Module-Name=Java EE\u30ea\u30bd\u30fc\u30b9
 OpenIDE-Module-Short-Description=JNDI EE\u30ea\u30bd\u30fc\u30b9\u306e\u691c\u51fa\u7528\u30e2\u30c7\u30eb
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-specs-support/javaee-specs-support/org/netbeans/modules/javaee/specs/support/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-specs-support/javaee-specs-support/org/netbeans/modules/javaee/specs/support/resources/Bundle_ja.properties
index 50d4e22..cee305e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-specs-support/javaee-specs-support/org/netbeans/modules/javaee/specs/support/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-specs-support/javaee-specs-support/org/netbeans/modules/javaee/specs/support/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java EE\u4ed5\u69d8\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Java EE
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/Bundle_ja.properties
index 8f837fc..f86cc0d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/Bundle_ja.properties
index 522f366..64b9f8b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_invalidCP=\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30fb\u30d1\u30b9\u5024\u3092\u4fee\u6b63: {0}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/ds/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/ds/Bundle_ja.properties
index af24389..0ed9e2e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/ds/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/ds/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_datasourcesXmlCannotParse=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb{0}\u306f\u89e3\u6790\u3067\u304d\u307e\u305b\u3093 - \u5909\u66f4\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/mdb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/mdb/Bundle_ja.properties
index 9c15708..5428d57 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/mdb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/config/mdb/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_msgdestXmlCannotParse=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb{0}\u306f\u89e3\u6790\u3067\u304d\u307e\u305b\u3093 - \u5909\u66f4\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/customizer/Bundle_ja.properties
index 0e08d3b..3a0f2f2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Customizer
 TXT_Tab_Classes=\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/Bundle_ja.properties
index 85d0876..f86a635 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 TITLE_JBOSS_LIBRARY=WildFly Java EE\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle_ja.properties
index d300adc..eea1638 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/ide/ui/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/Bundle_ja.properties
index d35e799..cc912dd 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/actions/Bundle_ja.properties
index ce77153..31bbc96 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/nodes/actions/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_ShowAdminGUIAction=\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb\u3092\u8868\u793a(&A)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/resources/Bundle_ja.properties
index 081a7f1..8f24409 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee-wildfly/javaee-wildfly/org/netbeans/modules/javaee/wildfly/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Name=WildFly\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30fc\u30d0\u30fc
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/javaee7-api/javaee7-api/org/netbeans/modules/javaee7/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/javaee7-api/javaee7-api/org/netbeans/modules/javaee7/api/Bundle_ja.properties
index 4fc9a8b..ef19756 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/javaee7-api/javaee7-api/org/netbeans/modules/javaee7/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/javaee7-api/javaee7-api/org/netbeans/modules/javaee7/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java EE
 OpenIDE-Module-Long-Description=JavaEE 7 API (\u3059\u3079\u3066\u306eAPI\u304a\u3088\u3073Web\u30d7\u30ed\u30d5\u30a1\u30a4\u30ebAPI)\u3092\u63d0\u4f9b\u3059\u308b\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30e9\u30c3\u30d1\u30fc
 OpenIDE-Module-Name=Java EE 7 API\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/jellytools-enterprise/jellytools-enterprise/org/netbeans/modules/jellytools/enterprise/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/jellytools-enterprise/jellytools-enterprise/org/netbeans/modules/jellytools/enterprise/Bundle_ja.properties
index 0395558..988daae 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/jellytools-enterprise/jellytools-enterprise/org/netbeans/modules/jellytools/enterprise/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/jellytools-enterprise/jellytools-enterprise/org/netbeans/modules/jellytools/enterprise/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Jelly\u30c4\u30fc\u30eb\u30fb\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/jsp-lexer/jsp-lexer/org/netbeans/lib/jsp/lexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/jsp-lexer/jsp-lexer/org/netbeans/lib/jsp/lexer/Bundle_ja.properties
index 9827998..80501b1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/jsp-lexer/jsp-lexer/org/netbeans/lib/jsp/lexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/jsp-lexer/jsp-lexer/org/netbeans/lib/jsp/lexer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JSP\u30ec\u30af\u30b5\u30fc
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/enterprise/ko4j-debugging/ko4j-debugging/org/netbeans/modules/ko4j/debugging/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/ko4j-debugging/ko4j-debugging/org/netbeans/modules/ko4j/debugging/Bundle_ja.properties
index 583df66..25cd4d9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/ko4j-debugging/ko4j-debugging/org/netbeans/modules/ko4j/debugging/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/ko4j-debugging/ko4j-debugging/org/netbeans/modules/ko4j/debugging/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=HTML5
 OpenIDE-Module-Long-Description=Java\u30c6\u30af\u30ce\u30ed\u30b8\u3092\u4f7f\u7528\u3057\u305fHTML\u7528Web\u30a4\u30f3\u30b9\u30da\u30af\u30bf\u3002HTML+Java\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304cNetBeans\u304b\u3089\u8d77\u52d5\u3055\u308c\u308b\u305f\u3073\u306b\u3001\u30bd\u30b1\u30c3\u30c8\u63a5\u7d9a\u3092\u958b\u304d\u3001NetBeans IDE\u306eDOM\u30a4\u30f3\u30b9\u30da\u30af\u30bf\u3068CSS\u30b9\u30bf\u30a4\u30eb\u30fb\u30ca\u30d3\u30b2\u30fc\u30bf\u306e\u5185\u90e8\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3HTML\u30da\u30fc\u30b8\u3092\u8868\u793a\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Java\u691c\u67fb\u306eKO
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/Bundle_ja.properties
index 24982fd..edc9f4d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_Verify=\u691c\u67fb
 LBL_WebPages=Web\u30da\u30fc\u30b8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ear/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ear/Bundle_ja.properties
index d5b302f..3835f3a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ear/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ear/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 PNL_Run=\u5b9f\u884c
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ejb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ejb/Bundle_ja.properties
index 4ba517e..9bf59b9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ejb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ejb/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 PNL_Run=\u5b9f\u884c
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/execution/Bundle_ja.properties
index 042b629..7d2b2e6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/execution/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_Server_No_Debugging=<html>\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u3067\u306f\u3001\u30c7\u30d0\u30c3\u30b0\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002<br>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3\u3067\u3001<b>\u5225\u306e\u30b5\u30fc\u30d0\u30fc\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044</b>\u3002</html>
 MSG_Server_No_Profiling=<html>\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u3067\u306f\u3001\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002<br>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3\u3067\u3001<b>\u5225\u306e\u30b5\u30fc\u30d0\u30fc\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044</b>\u3002</html>
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 ServerInstanceChooserPanel.jLabelTitle.text=\u4f7f\u7528\u53ef\u80fd\u306a\u30b5\u30fc\u30d0\u30fc\u30fb\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e1\u3064\u3092\u9078\u629e:
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/Bundle_ja.properties
index 654f131..ef44feb 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SelectAppServerPanel.lblProject.text=\u5185
 SelectAppServerPanel.rbIgnore.text=\u7121\u8996\u3002IDE\u3067\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u306e\u7ba1\u7406\u3092\u884c\u308f\u306a\u3044(&I)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/customizer/Bundle_ja.properties
index 9335820..c39d22e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DosDescription.text=<html>\u9078\u629e\u3059\u308b\u3068\u3001\u30d5\u30a1\u30a4\u30eb\u306f\u4fdd\u5b58\u6642\u306b\u30b3\u30f3\u30d1\u30a4\u30eb\u304a\u3088\u3073\u30c7\u30d7\u30ed\u30a4\u3055\u308c\u307e\u3059\u3002<br>\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u3001IDE\u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u307e\u305f\u306f\u30c7\u30d0\u30c3\u30b0\u3059\u308b\u3068\u304d\u306b\u3001\u6642\u9593\u306e\u7bc0\u7d04\u306b\u306a\u308a\u307e\u3059\u3002</html>
 DosDescriptionIfDisabled.text=<html>\u9078\u629e\u3059\u308b\u3068\u3001\u30d5\u30a1\u30a4\u30eb\u306f\u4fdd\u5b58\u6642\u306b\u30b3\u30f3\u30d1\u30a4\u30eb\u304a\u3088\u3073\u30c7\u30d7\u30ed\u30a4\u3055\u308c\u307e\u3059\u3002<br>\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u3001IDE\u3067\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u307e\u305f\u306f\u30c7\u30d0\u30c3\u30b0\u3059\u308b\u3068\u304d\u306b\u3001\u6642\u9593\u306e\u7bc0\u7d04\u306b\u306a\u308a\u307e\u3059\u3002<br>\u6ce8: \u300c\u4fdd\u5b58\u6642\u306b\u30c7\u30d7\u30ed\u30a4\u300d\u6a5f\u80fd\u3092\u6709\u52b9\u306b\u3059\u308b\u5834\u5408\u306f\u3001\u300c\u4fdd\u5b58\u6642\u306b\u30b3\u30f3\u30d1\u30a4\u30eb\u300d\u3092\u6700\u521d\u306b\u5909\u66f4\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059(\u3053\u306e\u3053\u3068\u306f\u3001\u30d3\u30eb\u30c9\u3084\u30b3\u30f3\u30d1\u30a4\u30eb\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3\u3067\u5b9f\u884c\u3067\u304d\u307e\u3059)</html>
 MSG_CheckBox_Value_Changed=\u3053\u306e\u5024\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u5024\u304b\u3089\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059
 MSG_ComboBox_Value_Changed=\u3053\u306e\u5024\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u5024\u304b\u3089\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 PNL_Run=\u5b9f\u884c
 PNL_Frameworks=\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 PNL_JavaScript-Libraries=JavaScript\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/customizer/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/customizer/impl/Bundle_ja.properties
index 35b1d01..66dac13 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/customizer/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/customizer/impl/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CustomizerFrameworks.label.adding.project.frameworks=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3092\u8ffd\u52a0\u4e2d
 CustomizerFrameworks.label.loading.frameworks=\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u30fb\u30ea\u30b9\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d...
 CustomizerFrameworks.label.saving.project.frameworks=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3092\u4fdd\u5b58\u4e2d
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 LBL_Server=\u30b5\u30fc\u30d0\u30fc:
 LBL_J2EE_Version=Java EE\u30d0\u30fc\u30b8\u30e7\u30f3:
 LBL_Display_on_Run=\u5b9f\u884c\u6642\u306b\u30d6\u30e9\u30a6\u30b6\u3092\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/nodes/Bundle_ja.properties
index 15d1946..5e89d13 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/nodes/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Web_Pages=Web\u30da\u30fc\u30b8
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/util/Bundle_ja.properties
index ea68aff..fc4a635 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 WarningPanel.lblText.text=jLabel1
 WarningPanel.cbNextTime.AccessibleContext.accessibleDescription=\u3053\u306e\u8b66\u544a\u3092\u6b21\u56de\u3082\u8868\u793a\u3059\u308b\u5834\u5408\u306f\u30c1\u30a7\u30c3\u30af
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/Bundle_ja.properties
index a135d88..70c2f64 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 EAVisualPanel.lblEEVersion.text=Java EE\u30d0\u30fc\u30b8\u30e7\u30f3(&J):
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/AppClientDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/AppClientDescription_ja.html
index b4e67fe..be52b48 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/AppClientDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/AppClientDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/EADescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/EADescription_ja.html
index cd0862e..7ede951 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/EADescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/EADescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/EjbDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/EjbDescription_ja.html
index 57529b1..a8e668c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/EjbDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/EjbDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/WebAppDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/WebAppDescription_ja.html
index df8c96c..7766406 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/WebAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/ui/wizard/resources/WebAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/utils/Bundle_ja.properties
index 021ade5..4e638a2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/utils/Bundle_ja.properties
@@ -1,42 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_Invalid_Server=<\u7121\u52b9\u306a\u30b5\u30fc\u30d0\u30fc>
 MSG_No_Server=<\u30b5\u30fc\u30d0\u30fc\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093>
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 TXT_Add_Server=\u30b5\u30fc\u30d0\u30fc\u306e\u8ffd\u52a0
 
 MSG_AppServer=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30fc\u30d0\u30fc"{0}"\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/web/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/web/Bundle_ja.properties
index 3ad20fa..edb8fab 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/web/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-j2ee/maven-j2ee/org/netbeans/modules/maven/j2ee/web/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 PNL_Run=\u5b9f\u884c
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/Bundle_ja.properties
index 02183af..c422ded 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Maven JAX-WS
 OpenIDE-Module-Display-Category=Maven
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/actions/Bundle_ja.properties
index 9865364..7828bd8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_OperationAction=\u64cd\u4f5c\u306e\u8ffd\u52a0...
 TITLE_OperationAction=\u64cd\u4f5c\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/nodes/Bundle_ja.properties
index 8e7b0ba..a096f69 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_WebServices=Web\u30b5\u30fc\u30d3\u30b9
 LBL_ServiceReferences=Web\u30b5\u30fc\u30d3\u30b9\u53c2\u7167
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/wizards/Bundle_ja.properties
index d7f6803..1c6bbd5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/wizards/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/wseditor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/wseditor/Bundle_ja.properties
index ccef7fd..ac02287 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/wseditor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-jaxws/maven-jaxws/org/netbeans/modules/maven/jaxws/wseditor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 HINT_EditWSAttributesTopComponent=\u3053\u308c\u306fEditWSAttributes\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3059\u3002
 MSG_PRESS_F1=\u30bb\u30af\u30b7\u30e7\u30f3\u56fa\u6709\u306e\u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u3001\u30d8\u30c3\u30c0\u30fc\u3067F1\u30ad\u30fc\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/Bundle_ja.properties
index 5e15b53..b719dd5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AbsoluteOrdering_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AbsoluteOrdering_ja.html
index fbdd900..4f60239 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AbsoluteOrdering_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AbsoluteOrdering_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AnnotationWar_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AnnotationWar_ja.html
index 73d8e7b..7c413fb 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AnnotationWar_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AnnotationWar_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AsyncChat_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AsyncChat_ja.html
index 17eccae..47e3b3e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AsyncChat_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AsyncChat_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AsynchronousProcessing_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AsynchronousProcessing_ja.html
index 5d1d079..bc9b46f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AsynchronousProcessing_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AsynchronousProcessing_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Auction_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Auction_ja.html
index 56c27d4..a196dd3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Auction_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Auction_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AutomaticTimer_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AutomaticTimer_ja.html
index 2275be5..448c5a8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AutomaticTimer_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/AutomaticTimer_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/BeanValidation_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/BeanValidation_ja.html
index 33cc311..ad2a8e9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/BeanValidation_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/BeanValidation_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/CDIGuess_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/CDIGuess_ja.html
index f9e35b5..d55a5af 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/CDIGuess_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/CDIGuess_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/CDIServlet_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/CDIServlet_ja.html
index dff0cd3..4ade3c9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/CDIServlet_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/CDIServlet_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Contracts_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Contracts_ja.html
index 9d4d41f..6945861 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Contracts_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Contracts_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Draw_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Draw_ja.html
index fc12282..16f1c4e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Draw_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Draw_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/DynamicRegistration_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/DynamicRegistration_ja.html
index 8983263..f8e1f04 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/DynamicRegistration_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/DynamicRegistration_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/EL_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/EL_ja.html
index 33b7be8..efa2261 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/EL_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/EL_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Echo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Echo_ja.html
index 2f10d8a..c54ff62 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Echo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Echo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/EjbEmbedded_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/EjbEmbedded_ja.html
index d6a8d3d..82fc06a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/EjbEmbedded_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/EjbEmbedded_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Events_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Events_ja.html
index 5a976b2..2126816 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Events_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Events_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Executor_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Executor_ja.html
index 8d8918f..2af0f67 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Executor_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Executor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/FileUpload_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/FileUpload_ja.html
index 83d953c..f88dfb1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/FileUpload_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/FileUpload_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HTML5_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HTML5_ja.html
index 76ea380..eb4ed85 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HTML5_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HTML5_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HelloStatelessEjb_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HelloStatelessEjb_ja.html
index e0c34c8..c2e3f76 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HelloStatelessEjb_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HelloStatelessEjb_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HelloStatelessWar_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HelloStatelessWar_ja.html
index 814f6ec..2711643 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HelloStatelessWar_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HelloStatelessWar_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HttpUpgrade_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HttpUpgrade_ja.html
index 4efeef9..e718dfe 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HttpUpgrade_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/HttpUpgrade_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Interceptors_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Interceptors_ja.html
index dee4483..61e5894 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Interceptors_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Interceptors_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JSONP_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JSONP_ja.html
index 432ac0d..4fb155e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JSONP_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JSONP_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JoboperatorAPI_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JoboperatorAPI_ja.html
index 1f98804..754850e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JoboperatorAPI_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JoboperatorAPI_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JspResourceInJar_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JspResourceInJar_ja.html
index 10da5fe..50b0dd9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JspResourceInJar_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/JspResourceInJar_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MailConnector_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MailConnector_ja.html
index 1ddcaf4..7c11dca 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MailConnector_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MailConnector_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Maven2CalculatorClient_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Maven2CalculatorClient_ja.html
index 82a2f5b..474d868 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Maven2CalculatorClient_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Maven2CalculatorClient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Maven2Calculator_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Maven2Calculator_ja.html
index e502264..a3a3803 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Maven2Calculator_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Maven2Calculator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MavenCRUDSample_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MavenCRUDSample_ja.html
index bc4f73b..01564b6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MavenCRUDSample_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MavenCRUDSample_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MavenScrumToys_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MavenScrumToys_ja.html
index cd26d4f..5fb12c3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MavenScrumToys_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MavenScrumToys_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MessageBoard_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MessageBoard_ja.html
index a30a5d1..8997305 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MessageBoard_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/MessageBoard_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Multipart_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Multipart_ja.html
index bfa1ba2..b3091de 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Multipart_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Multipart_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/NonBlockingRead_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/NonBlockingRead_ja.html
index 46e6a63..65f3aee 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/NonBlockingRead_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/NonBlockingRead_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/NonBlockingWrite_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/NonBlockingWrite_ja.html
index ae46606..26238f8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/NonBlockingWrite_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/NonBlockingWrite_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Payroll_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Payroll_ja.html
index c77d307..02990e6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Payroll_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Payroll_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Schedule_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Schedule_ja.html
index 49304d3..16af33c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Schedule_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Schedule_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Scrumtoys_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Scrumtoys_ja.html
index 748fb31..a005105 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Scrumtoys_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Scrumtoys_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/ServletContainer_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/ServletContainer_ja.html
index fc9fdf2..cf7a97c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/ServletContainer_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/ServletContainer_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/SessionCookie_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/SessionCookie_ja.html
index e677581..7b34d41 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/SessionCookie_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/SessionCookie_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Threads_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Threads_ja.html
index 176be3d..13f8d76 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Threads_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Threads_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Tictactoe_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Tictactoe_ja.html
index d9a66bc..2151356 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Tictactoe_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Tictactoe_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/TransactionScoped_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/TransactionScoped_ja.html
index 6ed871f..b880f48 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/TransactionScoped_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/TransactionScoped_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Transactional_ja.html b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Transactional_ja.html
index fd17af3..a27cf84 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Transactional_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/maven-samples/maven-samples/org/netbeans/modules/maven/samples/descriptions/Transactional_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-api-web-webmodule/org-netbeans-api-web-webmodule/org/netbeans/modules/web/webmodule/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-api-web-webmodule/org-netbeans-api-web-webmodule/org/netbeans/modules/web/webmodule/Bundle_ja.properties
index 48ca232..eafd0cb 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-api-web-webmodule/org-netbeans-api-web-webmodule/org/netbeans/modules/web/webmodule/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-api-web-webmodule/org-netbeans-api-web-webmodule/org/netbeans/modules/web/webmodule/Bundle_ja.properties
@@ -1,45 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Long-Description=Web\u30e2\u30b8\u30e5\u30fc\u30eb\u958b\u767a\u30b5\u30dd\u30fc\u30c8\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u7528\u306eAPI(\u3055\u307e\u3056\u307e\u306aWeb\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30b5\u30dd\u30fc\u30c8\u306a\u3069)\u3002
-# 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.
 OpenIDE-Module-Name=Web API
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Short-Description=Web\u30e2\u30b8\u30e5\u30fc\u30eb\u914d\u5099\u30b5\u30dd\u30fc\u30c8\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u7528\u306eAPI\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-amazon/org-netbeans-libs-amazon/org/netbeans/libs/amazon/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-amazon/org-netbeans-libs-amazon/org/netbeans/libs/amazon/Bundle_ja.properties
index d92c21b..39b9b0b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-amazon/org-netbeans-libs-amazon/org/netbeans/libs/amazon/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-amazon/org-netbeans-libs-amazon/org/netbeans/libs/amazon/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/jsch/manifest.mf
 OpenIDE-Module-Name=Amazon SDK
diff --git a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-commons_fileupload/org-netbeans-libs-commons_fileupload/org/netbeans/libs/commons_fileupload/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-commons_fileupload/org-netbeans-libs-commons_fileupload/org/netbeans/libs/commons_fileupload/Bundle_ja.properties
index 97920b3..3cf5153 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-commons_fileupload/org-netbeans-libs-commons_fileupload/org/netbeans/libs/commons_fileupload/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-commons_fileupload/org-netbeans-libs-commons_fileupload/org/netbeans/libs/commons_fileupload/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Commons FileUpload\u306e\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-elimpl/org-netbeans-libs-elimpl/org/netbeans/libs/elimpl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-elimpl/org-netbeans-libs-elimpl/org/netbeans/libs/elimpl/Bundle_ja.properties
index 7dff0ff..b7be3d6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-elimpl/org-netbeans-libs-elimpl/org/netbeans/libs/elimpl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-elimpl/org-netbeans-libs-elimpl/org/netbeans/libs/elimpl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u5f0f\u8a00\u8a9e\u306e\u5b9f\u88c5
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-glassfish_logging/org-netbeans-libs-glassfish_logging/org/netbeans/libs/glassfish_logging/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-glassfish_logging/org-netbeans-libs-glassfish_logging/org/netbeans/libs/glassfish_logging/Bundle_ja.properties
index d31fc3c..bebff1d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-glassfish_logging/org-netbeans-libs-glassfish_logging/org/netbeans/libs/glassfish_logging/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-glassfish_logging/org-netbeans-libs-glassfish_logging/org/netbeans/libs/glassfish_logging/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=GlassFish Commons Logging\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-jstl/org-netbeans-libs-jstl/org/netbeans/libs/jstl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-jstl/org-netbeans-libs-jstl/org/netbeans/libs/jstl/Bundle_ja.properties
index 2cf5371..6112a64 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-jstl/org-netbeans-libs-jstl/org/netbeans/libs/jstl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/org-netbeans-libs-jstl/org-netbeans-libs-jstl/org/netbeans/libs/jstl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module descritpion
 OpenIDE-Module-Name=JSP\u6a19\u6e96\u30bf\u30b0\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea1.2 (JSTL)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/performance-javaee/performance-javaee/org/netbeans/modules/performance/javaee/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/performance-javaee/performance-javaee/org/netbeans/modules/performance/javaee/Bundle_ja.properties
index 01e3b8c..b42a517 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/performance-javaee/performance-javaee/org/netbeans/modules/performance/javaee/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/performance-javaee/performance-javaee/org/netbeans/modules/performance/javaee/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9Java EE\u30c6\u30b9\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/performance-scripting/performance-scripting/org/netbeans/modules/performance/scripting/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/performance-scripting/performance-scripting/org/netbeans/modules/performance/scripting/Bundle_ja.properties
index 0678370..5288b91 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/performance-scripting/performance-scripting/org/netbeans/modules/performance/scripting/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/performance-scripting/performance-scripting/org/netbeans/modules/performance/scripting/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u30fb\u30b9\u30af\u30ea\u30d7\u30c8\u30fb\u30c6\u30b9\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/performance-web/performance-web/org/netbeans/modules/performance/web/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/performance-web/performance-web/org/netbeans/modules/performance/web/Bundle_ja.properties
index 56111e3..1602e7e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/performance-web/performance-web/org/netbeans/modules/performance/web/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/performance-web/performance-web/org/netbeans/modules/performance/web/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9Web\u30c6\u30b9\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/profiler-j2ee/profiler-j2ee/org/netbeans/modules/profiler/j2ee/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/profiler-j2ee/profiler-j2ee/org/netbeans/modules/profiler/j2ee/Bundle_ja.properties
index 7dda693..e846f37 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/profiler-j2ee/profiler-j2ee/org/netbeans/modules/profiler/j2ee/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/profiler-j2ee/profiler-j2ee/org/netbeans/modules/profiler/j2ee/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## Resource bundle for package org.netbeans.modules.profiler.
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/profiler-j2ee/profiler-j2ee/org/netbeans/modules/profiler/j2ee/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/profiler-j2ee/profiler-j2ee/org/netbeans/modules/profiler/j2ee/impl/Bundle_ja.properties
index 6d403df..b8577af 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/profiler-j2ee/profiler-j2ee/org/netbeans/modules/profiler/j2ee/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/profiler-j2ee/profiler-j2ee/org/netbeans/modules/profiler/j2ee/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## Resource bundle for package org.netbeans.modules.profiler.j2ee.impl
 DESC_Profiler=NetBeans\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/projectimport-eclipse-web/projectimport-eclipse-web/org/netbeans/modules/projectimport/eclipse/web/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/projectimport-eclipse-web/projectimport-eclipse-web/org/netbeans/modules/projectimport/eclipse/web/Bundle_ja.properties
index af7b560..bdea6f5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/projectimport-eclipse-web/projectimport-eclipse-web/org/netbeans/modules/projectimport/eclipse/web/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/projectimport-eclipse-web/projectimport-eclipse-web/org/netbeans/modules/projectimport/eclipse/web/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Eclipse Web\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30a4\u30f3\u30dd\u30fc\u30c8\u6a5f\u80fd
 ServerSelection.jLabel1.text=\u30b5\u30fc\u30d0\u30fc(&S):
 ServerSelection.jLabel2.text=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3067\u4f7f\u7528\u3059\u308b\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30fc\u30d0\u30fc\u3092\u9078\u629e:
diff --git a/netbeans-l10n-zip/src/ja/enterprise/servletjspapi/servletjspapi/org/netbeans/modules/servletjspapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/servletjspapi/servletjspapi/org/netbeans/modules/servletjspapi/Bundle_ja.properties
index 708d1b7..2d7e538 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/servletjspapi/servletjspapi/org/netbeans/modules/servletjspapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/servletjspapi/servletjspapi/org/netbeans/modules/servletjspapi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Servlet/JSP API
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/Bundle_ja.properties
index 48a9073..012023b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CreateSpringConfig.msg.invalid.dd=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u306b\u30a8\u30e9\u30fc\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002Spring\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3092\u624b\u52d5\u3067\u69cb\u6210\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 JSFConfigurationPanelVisual.lbl.searching.libraries=\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/editor/Bundle_ja.properties
index bc3948e..f68fe8d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/editor/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_BeanCodeGenerator=Spring Bean\u3092\u5ba3\u8a00...
 TTL_Add_Bean_Panel=Spring Bean\u3092\u5ba3\u8a00
 AddBeanPanelVisual.jLabel1.text=ID:
diff --git a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/Bundle_ja.properties
index 4f7a357..172f5a4 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Spring Web MVC
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/abstractController_ja.html b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/abstractController_ja.html
index 31b0470..b0456b8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/abstractController_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/abstractController_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/simpleFormController_ja.html b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/simpleFormController_ja.html
index b9df48b..cba7b23 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/simpleFormController_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/spring-webmvc/spring-webmvc/org/netbeans/modules/spring/webmvc/resources/simpleFormController_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/Bundle_ja.properties
index 805c51b..3f867b7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # Help menu items
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/config/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/config/Bundle_ja.properties
index 788457e..56bff61 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/config/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/config/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Loading_Config=META-INF/context.xml\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u306e\u69cb\u6210\u306e\u30ed\u30fc\u30c9\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 MSG_invalidCP=\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30fb\u30d1\u30b9\u5024\u3092\u4fee\u6b63: {0}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/customizer/Bundle_ja.properties
index 6252aba..8556be7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACS_Customizer=Tomcat\u30d7\u30ed\u30d1\u30c6\u30a3
 TXT_BrowseCatalinaScript=\u53c2\u7167(&B)...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/deploy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/deploy/Bundle_ja.properties
index 1d9f15e..9b78f58 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/deploy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/deploy/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_ServerXml_RO=\u30a2\u30f3\u30c7\u30d7\u30ed\u30a4\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30d5\u30a1\u30a4\u30eb{0}\u3078\u306e\u66f8\u8fbc\u307f\u30a2\u30af\u30bb\u30b9\u6a29\u304c\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/j2ee/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/j2ee/Bundle_ja.properties
index db13b37..c524a40 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/j2ee/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/j2ee/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_lib_name={0}\u500b\u306e\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/optional/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/optional/Bundle_ja.properties
index 2cff805..1531672 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/optional/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/optional/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_TomcatExecutionCommand=Tomcat\u5b9f\u884c\u30d7\u30ed\u30bb\u30b9
 MSG_startProcess=Tomcat\u30d7\u30ed\u30bb\u30b9\u3092\u958b\u59cb\u4e2d...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/registration/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/registration/Bundle_ja.properties
index 1d1febe..cb5a687 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/registration/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/registration/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_ApacheTomcat=Apache Tomcat {0}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/resources/Bundle_ja.properties
index 7697695..63eeeb5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # Module manifest localization
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/Bundle_ja.properties
index cfb268c..b542a1d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/actions/Bundle_ja.properties
index a51454e..64721c1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/nodes/actions/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/wizard/Bundle_ja.properties
index 769b181..41af827 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/ui/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 A11Y_DESC_ButtonBaseBrowse=\u30c7\u30a3\u30b9\u30af\u304b\u3089Tomcat\u30d9\u30fc\u30b9\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u63a2\u3057\u307e\u3059\u3002
 A11Y_DESC_ButtonHomeBrowse=\u30c7\u30a3\u30b9\u30af\u304b\u3089Tomcat\u30d9\u30fc\u30b9\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u63a2\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/util/Bundle_ja.properties
index f1dac21..75b08d6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/tomcat5/tomcat5/org/netbeans/modules/tomcat5/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ExceptionOccurred=\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 MSG_UnsupportedLogger=\u6307\u5b9a\u3057\u305f\u30ed\u30ac\u30fc{0}\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u305f\u3081\u3001\u30ed\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u8868\u793a\u3067\u304d\u307e\u305b\u3093\u3002\u4ee3\u308f\u308a\u306b\u30c7\u30d5\u30a9\u30eb\u30c8\u306eorg.apache.catalina.logger.FileLogger\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/Bundle_ja.properties
index c1a95a1..3106b7c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Beans_LOADER=Beans\u306e\u30d5\u30a1\u30a4\u30eb
 USG_CDI_BEANS_OPENED_PROJECT=\u65e2\u5b58\u306ebeans.xml\u30d5\u30a1\u30a4\u30eb\u3092\u542b\u3080\u958b\u304b\u308c\u3066\u3044\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8"{0}"\u3002 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/actions/Bundle_ja.properties
index 37c2964..755da69 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_GenerateInterceptor=\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u3092\u751f\u6210...
 LBL_InterceptorName=\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u540d\u306e\u9078\u629e(&I):
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/Bundle_ja.properties
index 7421208..597f695 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_RequireWebBeans=CDI\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u304c\u3001beans.xml\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 MSG_HintCreateBeansXml=beans.xml\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/Bundle_ja.properties
index ece3d70..670a68b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_BadAnnotationParamCtor=Bean\u30b3\u30f3\u30b9\u30c8\u30e9\u30af\u30bf\u306b\u306f@{0}\u306e\u6ce8\u91c8\u304c\u4ed8\u3044\u305f\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/annotation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/annotation/Bundle_ja.properties
index 1d97704..cd30de8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/annotation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/annotation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_NonEmptyNamedStereotype=\u30b9\u30c6\u30ec\u30aa\u30bf\u30a4\u30d7\u3067\u306f\u3001\u7a7a\u3067\u306a\u3044@Named\u6ce8\u91c8\u3092\u5ba3\u8a00\u3067\u304d\u307e\u305b\u3093\u3002 
 ERR_IncorrectRuntimeRetention=CDI\u6ce8\u91c8\u306f\u3001@Retention(RUNTIME)\u3068\u4e00\u7dd2\u306b\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/field/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/field/Bundle_ja.properties
index f372949..74a095c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/field/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/field/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_BadRestritedFieldType=\u30d5\u30a3\u30fc\u30eb\u30c9\u306eBean\u30af\u30e9\u30b9\u306f@Typed\u6ce8\u91c8\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u5024\u30e1\u30f3\u30d0\u30fc\u306f\u3001Bean\u306e\u7121\u5236\u9650\u306e\u4e00\u9023\u306eBean\u578b\u306e\u578b\u306b\u5bfe\u5fdc\u3057\u306a\u3044\u30af\u30e9\u30b9\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u3002 
 ERR_DelegateHasNoInject=\u30d5\u30a3\u30fc\u30eb\u30c9\u306f@Delegate\u3068\u3057\u3066\u5ba3\u8a00\u3055\u308c\u3066\u3044\u307e\u3059\u304c\u3001\u6ce8\u5165\u30dd\u30a4\u30f3\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/method/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/method/Bundle_ja.properties
index c0e1175..6ef08f6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/method/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/method/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_BadRestritedMethodType=\u30e1\u30bd\u30c3\u30c9\u306e\u623b\u308a\u578b\u306eBean\u30af\u30e9\u30b9\u306f\u3001@Typed\u6ce8\u91c8\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u5024\u30e1\u30f3\u30d0\u30fc\u306f\u3001Bean\u306e\u7121\u5236\u9650\u306e\u4e00\u9023\u306eBean\u578b\u306e\u578b\u306b\u5bfe\u5fdc\u3057\u306a\u3044\u30af\u30e9\u30b9\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u3002 
 ERR_BothAnnotationsMethod=\u30e1\u30bd\u30c3\u30c9\u306b{0}\u3068{1}\u306e\u4e21\u65b9\u306e\u6ce8\u91c8\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/type/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/type/Bundle_ja.properties
index 73572de..5824d0b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/type/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/analysis/analyzer/type/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_BadRestritedType=Bean\u30af\u30e9\u30b9\u306f@Typed\u6ce8\u91c8\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u5024\u30e1\u30f3\u30d0\u30fc\u306f\u3001Bean\u306e\u7121\u5236\u9650\u306e\u4e00\u9023\u306eBean\u578b\u306e\u578b\u306b\u5bfe\u5fdc\u3057\u306a\u3044\u30af\u30e9\u30b9\u3092\u6307\u5b9a\u3057\u3066\u3044\u307e\u3059\u3002 
 ERR_NonStaticInnerType=\u975estatic\u5185\u90e8\u30af\u30e9\u30b9\u3092\u7ba1\u7406\u5bfe\u8c61Bean\u307e\u305f\u306f\u7ba1\u7406\u5bfe\u8c61Bean\u306e\u30b9\u30fc\u30d1\u30fc\u30af\u30e9\u30b9\u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/hints/Bundle_ja.properties
index 22fa697..605569d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/hints/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CreateCDIAnnotation=CDI\u6ce8\u91c8\u3092\u4f5c\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/impl/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/impl/model/Bundle_ja.properties
index 799bc1e..0d3d5c2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/impl/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/impl/model/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ERR_MultipleDisposes=\u30e1\u30bd\u30c3\u30c9{0}\u306b\u306f\u3001@Disposes\u6ce8\u91c8\u306e\u3042\u308b\u8907\u6570\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
 ERR_MultipleObserves=\u30e1\u30bd\u30c3\u30c9{0}\u306b\u306f\u3001@Observes\u6ce8\u91c8\u306e\u3042\u308b\u8907\u6570\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
 ERR_DisposesHasObserves=\u30e1\u30bd\u30c3\u30c9{0}\u306f\u30c7\u30a3\u30b9\u30dd\u30fc\u30b6\u3068\u3057\u3066\u5ba3\u8a00\u3055\u308c\u3066\u3044\u307e\u3059\u304c\u3001@Observes\u6ce8\u91c8\u306e\u3042\u308b\u30d1\u30e9\u30e1\u30fc\u30bf\u3082\u542b\u307e\u308c\u3066\u3044\u307e\u3059 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/navigation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/navigation/Bundle_ja.properties
index cc05fcb..e980d83 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/navigation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/navigation/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_WaitNode=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/navigation/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/navigation/actions/Bundle_ja.properties
index 4c6b852..4c7bf9e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/navigation/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/navigation/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #inspect-injactables-at-caret=In&jactebles
 #inspect-injactables-at-caret-popup=Inspect Injectebles
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/BeansXml_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/BeansXml_ja.html
index 6f8f4ef..6450ee8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/BeansXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/BeansXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Bundle_ja.properties
index 2e0444b..5d77e39 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3068\u4f9d\u5b58\u6027\u306e\u6ce8\u5165\u30b5\u30dd\u30fc\u30c8
 
 Templates/CDI=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3068\u4f9d\u5b58\u6027\u306e\u6ce8\u5165
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Interceptor_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Interceptor_ja.html
index d90eec8..cb125d8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Interceptor_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Interceptor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Qualifier_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Qualifier_ja.html
index 5cddd35..24dad1e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Qualifier_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Qualifier_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Scope_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Scope_ja.html
index 2bc098c..8ee5b68 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Scope_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Scope_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Stereotype_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Stereotype_ja.html
index b56105a..294b525 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Stereotype_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/resources/Stereotype_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/wizard/Bundle_ja.properties
index c47228b..deaae98 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-beans/web-beans/org/netbeans/modules/web/beans/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TITLE_x_of_y={0}/{1}
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/Bundle_ja.properties
index 8b3cc8e..b10e9ef 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=HTML5
 OpenIDE-Module-Name=REST HTML5\u30af\u30e9\u30a4\u30a2\u30f3\u30c8
 OpenIDE-Module-Short-Description=HTML5\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30dd\u30fc\u30c8\u3067\u306eREST\u30b5\u30fc\u30d3\u30b9\u6d88\u8cbb
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/wizard/Bundle_ja.properties
index f7843c8..f6608d0 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/wizard/Bundle_ja.properties
@@ -1,46 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-# Sample ResourceBundle properties file
-
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/ClientSide/RestJavascriptClient.js=RESTful JavaScript\u30af\u30e9\u30a4\u30a2\u30f3\u30c8
 Templates/WebServices/RestJavascriptClient.js=RESTful JavaScript\u30af\u30e9\u30a4\u30a2\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/wizard/resources/JSClient_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/wizard/resources/JSClient_ja.html
index 83744e5..f089632 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/wizard/resources/JSClient_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-client-rest/web-client-rest/org/netbeans/modules/web/client/rest/wizard/resources/JSClient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/Bundle_ja.properties
index 9f1c531..8eac0c8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_source_not_found=\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 # module description
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/completion/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/completion/api/Bundle_ja.properties
index 4d4eff5..27fd027 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/completion/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/completion/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Text which is used for help runtime generating (for the code compeltion)
 LBL_TagName=\u30bf\u30b0\u540d:
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/resources/Bundle_ja.properties
index 3aed266..57d4c68 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/syntax/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 text/x-jsp=JSP
 text/x-tag=\u30bf\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/xmlsyntax/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/xmlsyntax/Bundle_ja.properties
index d652b70..459ebd6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/xmlsyntax/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core-syntax/web-core-syntax/org/netbeans/modules/web/core/xmlsyntax/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # END_COPYRIGHT_NOTICE}
 NAME_coloring_jsp-xml-text=XML\u30c6\u30ad\u30b9\u30c8\u5185\u5bb9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/Bundle_ja.properties
index 018b3df..e46614e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Actions/Tools/org-netbeans-modules-web-core-palette-JspPaletteCustomizerAction.instance=jsp
 # module description
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/jsploader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/jsploader/Bundle_ja.properties
index c0b8499..74d0464 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/jsploader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/jsploader/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/Bundle_ja.properties
index b732ec2..fb6d337 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Palette: categories
 #HTML Palette: categories
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/Bundle_ja.properties
index 7ac6be6..96ce9d8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Customizer_InsertPrefix=\u633f\u5165
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/resources/Bundle_ja.properties
index 52286d0..43c2f01 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/palette/items/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Palette: display names and tooltips for the components
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/ConnectionFailurePage_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/ConnectionFailurePage_ja.html
index e94c68f..588c4a4 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/ConnectionFailurePage_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/ConnectionFailurePage_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <HTML>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/JSPInfo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/JSPInfo_ja.html
index fa23c17..9c0e0a7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/JSPInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/JSPInfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/ServletListener_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/ServletListener_ja.html
index cc758b6..19eb72d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/ServletListener_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/ServletListener_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/Servlet_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/Servlet_ja.html
index dbf8998..66b8b39 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/Servlet_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/Servlet_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2001, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/SimpleFilter_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/SimpleFilter_ja.html
index 7dfeaa1..ce24c03 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/SimpleFilter_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/SimpleFilter_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagFile_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagFile_ja.html
index 5cd283e..b8a0cb3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagHandler_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagHandler_ja.html
index 7bc9bfe..150f170 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagHandler_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagHandler_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagLibrary_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagLibrary_ja.html
index a01a2bd..ae89cc8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/TagLibrary_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/WebInfo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/WebInfo_ja.html
index 18153b7..18d2a8c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/WebInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/WebInfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/webFragmentXml_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/webFragmentXml_ja.html
index 5ffbb52..5c212cf 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/webFragmentXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/webFragmentXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/webXml_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/webXml_ja.html
index 1f1d4ea..d1fa0a3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/webXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/core/resources/webXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/taglib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/taglib/Bundle_ja.properties
index 4f6ce0b..c5a57f9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/taglib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/taglib/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DESC_TaglibCatalog=\u30bf\u30b0\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bfDTD\u304a\u3088\u3073XML\u30b9\u30ad\u30fc\u30de\u30fb\u30d5\u30a1\u30a4\u30eb\u306eXML\u30ab\u30bf\u30ed\u30b0\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/Bundle_ja.properties
index d04e47b..222fa43 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 JsfJspValidatorPanel.warn.document.root=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u306f\u3001\u6709\u52b9\u306aDocumentRoot\u304c\u3042\u308a\u307e\u305b\u3093
 # Generic labels, used in several places
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/dd/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/dd/Bundle_ja.properties
index 7da08f4..65183ae 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/dd/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/dd/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/JSP_Servlet/web.xml=\u6a19\u6e96\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf(web.xml)
 Templates/JSP_Servlet/web-fragment.xml=Web\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8\u30fb\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf(web-fragment.xml)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/targetpanel/providers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/targetpanel/providers/Bundle_ja.properties
index cb3daba..8eb4b26 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/targetpanel/providers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-core/web-core/org/netbeans/modules/web/wizards/targetpanel/providers/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_13notSupported=J2EE1.3 Web\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3001\u3053\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 MSG_noTldSelectedForTagFile=\u30bf\u30b0\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf(TLD\u30d5\u30a1\u30a4\u30eb)\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/Bundle_ja.properties
index d7aa4c5..f4e2105 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # END_COPYRIGHT_NOTICE}
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/actions/Bundle_ja.properties
index 1d9ab81..18490af 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Toggle Breakpoint
 CTL_Toggle_breakpoint=\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u3092\u5207\u66ff\u3048(&B)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/breakpoints/Bundle_ja.properties
index 90fd96a..1bd68e7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # END_COPYRIGHT_NOTICE}
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/variablesfilterring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/variablesfilterring/Bundle_ja.properties
index 6725295..d8799b5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/variablesfilterring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/variablesfilterring/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 #Call Stack Filter Node
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/watchesfiltering/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/watchesfiltering/Bundle_ja.properties
index 96bc0f5..ba72e2c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/watchesfiltering/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-debug/web-debug/org/netbeans/modules/web/debug/watchesfiltering/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # WatchesActionsProvider
 CTL_WatchAction_AddNew = \u65b0\u898f\u30a6\u30a9\u30c3\u30c1 ...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/Bundle_ja.properties
index 99dac22..1d92397 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u5f0f\u8a00\u8a9e
 
 LBL_Navigate=\u30ca\u30d3\u30b2\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/hints/Bundle_ja.properties
index 1dbce50..a206671 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/hints/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 csl-hints/text/x-el/hints/general=\u4e00\u822c
 ResourceBundleKeys=\u30ea\u30bd\u30fc\u30b9\u30fb\u30d0\u30f3\u30c9\u30eb\u30fb\u30ad\u30fc
 ResourceBundleKeys_Desc=\u4e0d\u660e\u306a\u30ea\u30bd\u30fc\u30b9\u30fb\u30d0\u30f3\u30c9\u30eb\u30fb\u30ad\u30fc\u3092\u691c\u67fb
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/navigation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/navigation/Bundle_ja.properties
index 46403ea..0c85b08 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/navigation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/navigation/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_GoToDeclaration=\u5ba3\u8a00\u3078\u79fb\u52d5
 ResourceBundle=\u30ea\u30bd\u30fc\u30b9\u30fb\u30d0\u30f3\u30c9\u30eb: {0}
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/refactoring/Bundle_ja.properties
index 33aeb3b..9646966 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-el/web-el/org/netbeans/modules/web/el/refactoring/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Update={0}\u3078\u306eEL\u53c2\u7167\u3092\u66f4\u65b0
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/Bundle_ja.properties
index ef37078..f9ffb87 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 ## manifest.mf
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/jsp_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/jsp_ja.html
index 38f7023..e70d613 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/jsp_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/jsp_ja.html
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.1 Transitional//EN">
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/jstl_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/jstl_ja.html
index 296e4b6..83c7148 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/jstl_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/jstl_ja.html
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.1 Transitional//EN">
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/servlets_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/servlets_ja.html
index 34b574c..08478a9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/servlets_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/servlets_ja.html
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.1 Transitional//EN">
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/webSamplesCategory_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/webSamplesCategory_ja.html
index e3047d8..df49141 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/webSamplesCategory_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-examples/web-examples/org/netbeans/modules/web/examples/descriptions/webSamplesCategory_ja.html
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 </head><body>Webアプリケーション・サンプル・プロジェクト。</body></html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/Bundle_ja.properties
index 1dc16fd..e2d3739 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u81ea\u7531\u5f62\u5f0f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306eWeb\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Web
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/Bundle_ja.properties
index 4ad126a..7757f90 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Project/Web/webfreeform.xml=Web\u81ea\u7531\u5f62\u5f0f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/freeform-project-web_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/freeform-project-web_ja.html
index 9a6d24f..7b8c538 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/freeform-project-web_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/resources/freeform-project-web_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/ui/Bundle_ja.properties
index 26e3095..c2ae3a7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-freeform/web-freeform/org/netbeans/modules/web/freeform/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Web Pages panel
 TXT_NewWebFreeformProjectWizardIterator_WebSources=Web\u30bd\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/Bundle_ja.properties
index f06a068..40586b7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 JSPPalette/JSF=JSF
 HTMLPalette/HTML.shadow=HTML
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/actions/Bundle_ja.properties
index 40de08c..277a94f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FixDupImportStmts_Title=\u73fe\u884cFacelet\u306e\u540d\u524d\u7a7a\u9593\u306e\u4fee\u6b63
 FixDupImportStmts_IntroLbl=<html>\u540d\u524d\u7a7a\u9593\u5ba3\u8a00\u6587\u3067\u4f7f\u7528\u3059\u308b\u540d\u524d\u7a7a\u9593\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002</html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/completion/Bundle_ja.properties
index 456906d..33267eb 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_NO_TLD=\u30bf\u30b0\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u306f\u3042\u308a\u307e\u305b\u3093
 MSG_NO_TLD_ITEM_DESCR=\u30bf\u30b0\u306e\u8aac\u660e\u306f\u3042\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/el/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/el/Bundle_ja.properties
index ed0b18f..e0601b2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/el/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/el/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 MSG_source_not_found=\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/facelets/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/facelets/Bundle_ja.properties
index df9b98a..4aba6a9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/facelets/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/facelets/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_COMPOSITE_COMPONENT_SOURCE=\u30bd\u30fc\u30b9:
 MSG_COMPOSITE_COMPONENT_DISPLAYNAME=\u8868\u793a\u540d:
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/hints/Bundle_ja.properties
index 22bb54e..66d694c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/hints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_UNKNOWN_CC_COMPONENT=\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea{0}\u306b\u306f\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8{1}\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093
 MSG_MISSING_REQUIRED_ATTRIBUTE=\u5fc5\u9808\u5c5e\u6027{0}\u304c\u3042\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/refactoring/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/refactoring/actions/Bundle_ja.properties
index ae28c9f..ff506c4 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/refactoring/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/refactoring/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ConvertToCompositeComponents=\u5408\u6210\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306b\u5909\u63db...
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/resources/Bundle_ja.properties
index d51f0a7..8fd6c54 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-editor/web-jsf-editor/org/netbeans/modules/web/jsf/editor/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=XHTML\u7528\u306eJSF\u30a8\u30c7\u30a3\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/Bundle_ja.properties
index d3586c1..eb90e25 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DESC_IcefacesImplementation=JavaServer Faces\u30c6\u30af\u30ce\u30ed\u30b8\u306b\u57fa\u3065\u3044\u305f\u30aa\u30fc\u30d7\u30f3\u30fb\u30bd\u30fc\u30b9\u306e\u30ea\u30c3\u30c1\u30fb\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3(RIA)\u958b\u767a\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/resources/Bundle_ja.properties
index f72897e..93ef8bc 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
 OpenIDE-Module-Long-Description=ICEfaces\u306f\u5358\u306a\u308bAjax JSF\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u3067\u306f\u306a\u304f\u3001\u30ea\u30c3\u30c1\u30fb\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3(REA)\u306e\u958b\u767a\u3068\u30c7\u30d7\u30ed\u30a4\u306e\u305f\u3081\u306eJ2EE Ajax\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3067\u3059\u3002ICEfaces\u3092\u4f7f\u7528\u3057\u3066\u3001\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30baJava\u958b\u767a\u8005\u306f\u3001JavaScript\u3067\u306f\u306a\u304f\u3001Java\u3067\u30ea\u30c3\u30c1\u30fb\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u7c21\u5358\u306b\u958b\u767a\u3067\u304d\u307e\u3059\u3002
 OpenIDE-Module-Name=ICEfaces
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/ui/Bundle_ja.properties
index fe6d3f5..d91f37c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-icefaces/web-jsf-icefaces/org/netbeans/modules/web/jsf/icefaces/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_MissingIcefacesLibraries=\u6709\u52b9\u306aICEfaces\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u65b0\u3057\u304f\u4f5c\u6210\u3057\u307e\u3059\u3002
 Icefaces2CustomizerPanelVisual.headerLabel.text=<html><b>\u6709\u52b9\u306aICEfaces\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u9078\u629e\u3059\u308b\u304b\u3001\u4f5c\u6210\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059:</b></html>
 Icefaces2CustomizerPanelVisual.icefacesLibraryLabel.text=\u6709\u52b9\u306aICEfaces\u30e9\u30a4\u30d6\u30e9\u30ea:
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-kit/web-jsf-kit/org/netbeans/modules/web/jsf/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-kit/web-jsf-kit/org/netbeans/modules/web/jsf/kit/Bundle_ja.properties
index 6eabcf8..369b240 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-kit/web-jsf-kit/org/netbeans/modules/web/jsf/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-kit/web-jsf-kit/org/netbeans/modules/web/jsf/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
 OpenIDE-Module-Name=JSF
 OpenIDE-Module-Short-Description=JavaServer Faces\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/Bundle_ja.properties
index da0ab28..8f089ad 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Name=\u30da\u30fc\u30b8\u30fb\u30d5\u30ed\u30fc\u30fb\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/graph/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/graph/Bundle_ja.properties
index e66c5b4..5c180da 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/graph/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/graph/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0}=name
 MSG_ConfirmDeleteObject=\u672c\u5f53\u306b{0}\u3092\u524a\u9664\u3057\u307e\u3059\u304b?
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/graph/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/graph/actions/Bundle_ja.properties
index 3bc39e3..b33b148 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/graph/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-navigation/web-jsf-navigation/org/netbeans/modules/web/jsf/navigation/graph/actions/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 MSG_Delete=\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-richfaces/web-jsf-richfaces/org/netbeans/modules/web/jsf/richfaces/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-richfaces/web-jsf-richfaces/org/netbeans/modules/web/jsf/richfaces/Bundle_ja.properties
index b6c94dd..c2d7054 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-richfaces/web-jsf-richfaces/org/netbeans/modules/web/jsf/richfaces/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-richfaces/web-jsf-richfaces/org/netbeans/modules/web/jsf/richfaces/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=RichFaces
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-richfaces/web-jsf-richfaces/org/netbeans/modules/web/jsf/richfaces/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-richfaces/web-jsf-richfaces/org/netbeans/modules/web/jsf/richfaces/ui/Bundle_ja.properties
index c8fc0a8..6ef5491 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf-richfaces/web-jsf-richfaces/org/netbeans/modules/web/jsf/richfaces/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf-richfaces/web-jsf-richfaces/org/netbeans/modules/web/jsf/richfaces/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_MissingRichFaces=\u5b8c\u5168\u306aRichFaces\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u5fc5\u9808JAR\u306e\u30ea\u30b9\u30c8\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 LBL_MissingDependency=\u3053\u306e\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u306f{0}\u3082\u542b\u3081\u308b\u3053\u3068\u3092\u63a8\u5968\u3057\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/Bundle_ja.properties
index e439742..2257164 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9
 # Catalog for configuration files
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/dialogs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/dialogs/Bundle_ja.properties
index d9683aa..4849039 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/dialogs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/dialogs/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # AddManagedBeanDialog
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/editor/Bundle_ja.properties
index c46aef6..b46dc31 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 lbl.goto.source.not.found={0}\u306e\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 lbl.managed.bean.not.found=\u7ba1\u7406\u5bfe\u8c61Bean {0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/facelets/resources/TemplateClient_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/facelets/resources/TemplateClient_ja.html
index ae96799..27cd76a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/facelets/resources/TemplateClient_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/facelets/resources/TemplateClient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <HTML>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/facelets/resources/Template_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/facelets/resources/Template_ja.html
index 75280db..3bdb50f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/facelets/resources/Template_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/facelets/resources/Template_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <HTML>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/hints/Bundle_ja.properties
index 063469e..385123e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/hints/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 org-netbeans-modules-java-hints/rules/hints/javaee/jsf=JavaServer Faces
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/hints/rules/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/hints/rules/Bundle_ja.properties
index eceeee0..455d829 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/hints/rules/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/hints/rules/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ChangeClassFix.lbl.change.class.fix={0}\u3092{1}\u306b\u5909\u66f4
 # {0} - project display name
 FixCdiAvailability.lbl.enable.cdi=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u3067CDI\u3092\u6709\u52b9\u5316
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/impl/facesmodel/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/impl/facesmodel/Bundle_ja.properties
index 7a6fa93..1a86a87 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/impl/facesmodel/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/impl/facesmodel/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_Save_FacesConfig=Faces\u69cb\u6210\u3092\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f: {0}
 ERR_UpdateFacesConfigModel=Faces\u69cb\u6210\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f: {0}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/Bundle_ja.properties
index 2b01d1a..f1cb765 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Palette: categories
 #JSF Palette: categories
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/Bundle_ja.properties
index 162d391..4949f4d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Entity Class Customizer
 NAME_jsp-JsfForm=JSF\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/resources/Bundle_ja.properties
index 53b3d78..4f8dfbb 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/palette/items/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Palette: display names and tooltips for the components
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/refactoring/Bundle_ja.properties
index 809de92..8e1d061 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/refactoring/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_ManagedBeanClass_Rename = <b>{0}</b>\u7ba1\u7406\u5bfe\u8c61Bean\u5b9a\u7fa9\u306e\u7ba1\u7406\u5bfe\u8c61Bean\u30af\u30e9\u30b9\u3092\u5909\u66f4 - {1}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/Bundle_ja.properties
index 8af8c04..6dd2ef2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JSF\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Web
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/FacesComponent_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/FacesComponent_ja.html
index d54887d..9885e9d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/FacesComponent_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/FacesComponent_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/FacesConfig_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/FacesConfig_ja.html
index ba9d370..935b097 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/FacesConfig_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/FacesConfig_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFInfo_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFInfo_ja.html
index b26bd71..619b463 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFInfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFManagedBean_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFManagedBean_ja.html
index c17521b..ab4eaf9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFManagedBean_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JSFManagedBean_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JsfFromDB_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JsfFromDB_ja.html
index cf6d2aa..4a40bfe 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JsfFromDB_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/JsfFromDB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/ResourceLibraryContract_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/ResourceLibraryContract_ja.html
index 2b96593..2a5515c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/ResourceLibraryContract_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/ResourceLibraryContract_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/compositeComponent_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/compositeComponent_ja.html
index e10122e..a969b66 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/compositeComponent_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/resources/compositeComponent_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/wizards/Bundle_ja.properties
index 95e31a4..0157e9c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf/web-jsf/org/netbeans/modules/web/jsf/wizards/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 FacesComponentPanel.err.jsf.version.not.suficient=\u3053\u306e\u6a5f\u80fd\u306e\u6700\u5c0f\u5fc5\u9808JSF\u30d0\u30fc\u30b8\u30e7\u30f3\u306fJSF 2.2\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf12/web-jsf12/org/netbeans/modules/web/jsf12/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf12/web-jsf12/org/netbeans/modules/web/jsf12/Bundle_ja.properties
index 57eda3b..f4c9f99 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf12/web-jsf12/org/netbeans/modules/web/jsf12/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf12/web-jsf12/org/netbeans/modules/web/jsf12/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module descritpion
 OpenIDE-Module-Name=JavaServer Faces 1.2\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf12ri/web-jsf12ri/org/netbeans/modules/web/jsf12ri/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf12ri/web-jsf12ri/org/netbeans/modules/web/jsf12ri/Bundle_ja.properties
index e01963d..531f533 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf12ri/web-jsf12ri/org/netbeans/modules/web/jsf12ri/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf12ri/web-jsf12ri/org/netbeans/modules/web/jsf12ri/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JavaServer Faces 1.2 RI
 OpenIDE-Module-Display-Category=Web
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsf20/web-jsf20/org/netbeans/modules/web/jsf20/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsf20/web-jsf20/org/netbeans/modules/web/jsf20/Bundle_ja.properties
index f43bbbb..1f0f473 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsf20/web-jsf20/org/netbeans/modules/web/jsf20/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsf20/web-jsf20/org/netbeans/modules/web/jsf20/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module descritpion
 OpenIDE-Module-Name=JavaServer Faces 2.2\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jsfapi/web-jsfapi/org/netbeans/modules/web/jsfapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jsfapi/web-jsfapi/org/netbeans/modules/web/jsfapi/Bundle_ja.properties
index ba969fb..4a561d3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jsfapi/web-jsfapi/org/netbeans/modules/web/jsfapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jsfapi/web-jsfapi/org/netbeans/modules/web/jsfapi/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java EE
 OpenIDE-Module-Name=JSF API
 OpenIDE-Module-Short-Description=\u3055\u307e\u3056\u307e\u306aJSF\u95a2\u9023\u6a5f\u80fd\u7528\u306eJSF API
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jspparser/web-jspparser/org/netbeans/modules/web/jspparser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jspparser/web-jspparser/org/netbeans/modules/web/jspparser/Bundle_ja.properties
index b9acb16..935ef96 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jspparser/web-jspparser/org/netbeans/modules/web/jspparser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jspparser/web-jspparser/org/netbeans/modules/web/jspparser/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module description
 OpenIDE-Module-Name=JSP\u30d1\u30fc\u30b5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-jspparser/web-jspparser/org/netbeans/modules/web/jsps/parserapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-jspparser/web-jspparser/org/netbeans/modules/web/jsps/parserapi/Bundle_ja.properties
index 0fa3cda..0bbfdb7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-jspparser/web-jspparser/org/netbeans/modules/web/jsps/parserapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-jspparser/web-jspparser/org/netbeans/modules/web/jsps/parserapi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 EXC_JspParserNotInstalled=JSP\u69cb\u6587\u89e3\u6790\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-kit/web-kit/org/netbeans/modules/web/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-kit/web-kit/org/netbeans/modules/web/kit/Bundle_ja.properties
index e32ef5c..c9ccdb1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-kit/web-kit/org/netbeans/modules/web/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-kit/web-kit/org/netbeans/modules/web/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
 OpenIDE-Module-Name=Java EE\u30d9\u30fc\u30b9
 OpenIDE-Module-Short-Description=Java EE\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u958b\u767a\u306e\u30d9\u30fc\u30b9\u30ec\u30d9\u30eb\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-monitor/ext/web-httpmonitor/org/netbeans/modules/web/monitor/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-monitor/ext/web-httpmonitor/org/netbeans/modules/web/monitor/server/Bundle_ja.properties
index ff3ae37..2e300b2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-monitor/ext/web-httpmonitor/org/netbeans/modules/web/monitor/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-monitor/ext/web-httpmonitor/org/netbeans/modules/web/monitor/server/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MON_Deploy_first=\u8b66\u544a: \u9023\u9396\u306e\u6700\u521d\u306e\u30d5\u30a3\u30eb\u30bf\u306f\u30e2\u30cb\u30bf\u30fc\u30fb\u30d5\u30a3\u30eb\u30bf\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 MON_Warning_attributes=\u8b66\u544a: \u3053\u306e\u5c5e\u6027\u306f\u7121\u52b9\u306b\u306a\u308a\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-monitor/web-monitor/org/netbeans/modules/web/monitor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-monitor/web-monitor/org/netbeans/modules/web/monitor/Bundle_ja.properties
index 683129a..68ce8a2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-monitor/web-monitor/org/netbeans/modules/web/monitor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-monitor/web-monitor/org/netbeans/modules/web/monitor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # END_COPYRIGHT_NOTICE}
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-monitor/web-monitor/org/netbeans/modules/web/monitor/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-monitor/web-monitor/org/netbeans/modules/web/monitor/client/Bundle_ja.properties
index 806b499..d23d9e3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-monitor/web-monitor/org/netbeans/modules/web/monitor/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-monitor/web-monitor/org/netbeans/modules/web/monitor/client/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MON_All_1=\u3059\u3079\u3066
 MON_All_transactions_2=\u3059\u3079\u3066\u306e\u30ec\u30b3\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/Bundle_ja.properties
index 33f54f6..8930d44 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_PrimeFaces_Description=PrimeFaces\u306fJavaServer Faces\u7528\u306e\u30aa\u30fc\u30d7\u30f3\u30fb\u30bd\u30fc\u30b9\u306e\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u30fb\u30b9\u30a4\u30fc\u30c8\u3067\u300190\u4ee5\u4e0a\u306e\u30ea\u30c3\u30c1\u306aJSF\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u30bb\u30c3\u30c8\u3092\u542b\u3093\u3067\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/resources/Bundle_ja.properties
index 2ee06ab..6dd673e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
 OpenIDE-Module-Name=PrimeFaces
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u306f\u3001JavaServer Faces\u3067\u4f7f\u7528\u3067\u304d\u308bPrimeFaces JSF\u30b9\u30a4\u30fc\u30c8\u304c\u30d0\u30f3\u30c9\u30eb\u3055\u308c\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/ui/Bundle_ja.properties
index d6eb26f..a1a12d8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-primefaces/web-primefaces/org/netbeans/modules/web/primefaces/ui/Bundle_ja.properties
@@ -1,42 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 PrimefacesCustomizerPanel.lbl.searching=Primefaces\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059...
 PrimefacesCustomizerPanel.MissingLibraries.label=\u6709\u52b9\u306aPrimeFaces\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 PrimefacesCustomizerPanel.primefacesLibraryLabel.text=Primefaces\u30e9\u30a4\u30d6\u30e9\u30ea:
 PrimefacesCustomizerPanel.createLibraryButton.text=\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u4f5c\u6210
 PrimefacesCustomizerPanel.noteLabel.text=\u6ce8: \u6709\u52b9\u306aPrimefaces\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u306f\u3001\u5c11\u306a\u304f\u3068\u3082primefaces-x.x.jar\u304c\u542b\u307e\u308c\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/Bundle_ja.properties
index db898ef..9800933 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_ProjectReadOnly=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306f\u8aad\u53d6\u308a\u5c02\u7528\u3067\u3059\u3002
 OpenIDE-Module-Name=Web\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/api/Bundle_ja.properties
index 0999b3b..d5780f8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NAME_src.dir=\u30bd\u30fc\u30b9\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8
 NAME_test.src.dir=\u30c6\u30b9\u30c8\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/jaxws/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/jaxws/Bundle_ja.properties
index f4f23b2..2016d98 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/jaxws/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/jaxws/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_CannotFindWEB-INF=WEB-INF\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u524a\u9664\u3055\u308c\u305f\u304b\u3001\u540d\u524d\u304c\u5909\u66f4\u3055\u308c\u305f\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
 MSG_CannotFindDDDirectory=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u524a\u9664\u3055\u308c\u305f\u304b\u3001\u540d\u524d\u304c\u5909\u66f4\u3055\u308c\u305f\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/Bundle_ja.properties
index fbf9e0a..fe5f5da 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Actions
 LBL_SetViewAction_Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d3\u30e5\u30fc\u3092\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/customizer/Bundle_ja.properties
index 1b191d0..d102f67 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CustomizerDialog
 LBL_Customizer_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3 - {0}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web-emptyProject_ja.html
index 4400ec1..d576d5b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web-emptyProject_ja.html
@@ -1,41 +1,21 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
-
-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.
-
-Contributor(s):
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
 -->
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web-importProject_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web-importProject_ja.html
index 7947cda..28664b3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web-importProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web-importProject_ja.html
@@ -1,41 +1,21 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
-
-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.
-
-Contributor(s):
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
 -->
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web_ja.html
index aed1278..10a7d73 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/resources/web_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/wizards/Bundle_ja.properties
index 78f3d15..274d65b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-project/web-project/org/netbeans/modules/web/project/ui/wizards/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 #System file system
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/Bundle_ja.properties
index 345aec8..b72baef 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Web\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
 TXT_WebXmlNotReadable=web.xml\u3078\u306e\u30a2\u30af\u30bb\u30b9\u306b\u554f\u984c\u304c\u3042\u308b\u305f\u3081\u3001\u5909\u66f4\u5185\u5bb9\u3092web.xml\u306b\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002
 TXT_WebXmlInvalidProblem=web.xml\u304c\u7121\u52b9\u306a\u305f\u3081\u3001\u5909\u66f4\u5185\u5bb9\u3092web.xml\u306b\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/rename/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/rename/Bundle_ja.properties
index b35dae6..5d56d18 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/rename/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/rename/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_WebXmlServletRename=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30fb\u30af\u30e9\u30b9\u53c2\u7167<b>{1}</b>\u3092<b>{2}</b>\u306b\u66f4\u65b0
 TXT_WebXmlListenerRename=\u30ea\u30b9\u30ca\u30fc\u30fb\u30af\u30e9\u30b9\u53c2\u7167<b>{1}</b>\u3092<b>{2}</b>\u306b\u66f4\u65b0
 TXT_WebXmlFilterRename=\u30d5\u30a3\u30eb\u30bf\u30fb\u30af\u30e9\u30b9\u53c2\u7167<b>{1}</b>\u3092<b>{2}</b>\u306b\u66f4\u65b0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/safedelete/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/safedelete/Bundle_ja.properties
index c28ba19..7dcb1c8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/safedelete/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/safedelete/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_WebXmlInvalidProblem=\u5909\u66f4\u70b9\u306e{0}\u3078\u306e\u53cd\u6620\u306f\u3001{0}\u304c\u7121\u52b9\u306a\u305f\u3081\u884c\u3048\u307e\u305b\u3093\u3002
 TXT_TldInvalidProblem=\u30bf\u30b0\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u30fb\u30d5\u30a1\u30a4\u30eb{0}\u304c\u7121\u52b9\u306a\u305f\u3081\u3001\u5909\u66f4\u5185\u5bb9\u3092\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002
 TXT_WebXmlServletMappingSafeDelete=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30fb\u30de\u30c3\u30d4\u30f3\u30b0&lt;servlet-name&gt;<b>{0}</b>&lt;/servlet-name&gt;\u3092\u524a\u9664    
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/whereused/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/whereused/Bundle_ja.properties
index f6579f1..cf51e9d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/whereused/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-refactoring/web-refactoring/org/netbeans/modules/web/refactoring/whereused/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_WebXmlWhereUsedInvalidProblem=web.xml\u304c\u7121\u52b9\u306a\u305f\u3081\u3001web.xml\u5185\u3067\u4f7f\u7528\u72b6\u6cc1\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 TXT_TaglibWhereUsedInvalidProblem=\u30bf\u30b0\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u30fb\u30d5\u30a1\u30a4\u30eb{0}\u304c\u7121\u52b9\u306a\u305f\u3081\u3001\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u4f7f\u7528\u72b6\u6cc1\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/Bundle_ja.properties
index 7e4ee17..84e1054 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9(&S)
 LBL_loaderName=Struts\u69cb\u6210\u30ed\u30fc\u30c0\u30fc
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/dialogs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/dialogs/Bundle_ja.properties
index abc2c92..f142f56 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/dialogs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/dialogs/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # AddFIActionPanel
 ActionType=\u30a2\u30af\u30b7\u30e7\u30f3\u30fb\u30bf\u30a4\u30d7:
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/editor/Bundle_ja.properties
index 3e87f60..7e106fe 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/editor/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 lbl.class.not.found=\u30af\u30e9\u30b9{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/Bundle_ja.properties
index f5c24f5..308fe0f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Struts
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsAction_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsAction_ja.html
index 5fbb482..031bc0e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsAction_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsAction_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsFormBean_ja.html b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsFormBean_ja.html
index 74a8722..35de702 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsFormBean_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/resources/StrutsFormBean_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/ui/Bundle_ja.properties
index 13375e2..f132532 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/ui/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # StrutsConfigurationPanelVisual
diff --git a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/wizards/Bundle_ja.properties
index f65e363..953ac5a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/web-struts/web-struts/org/netbeans/modules/web/struts/wizards/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # Sample ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/enterprise/weblogic-common/weblogic-common/org/netbeans/modules/weblogic/common/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/weblogic-common/weblogic-common/org/netbeans/modules/weblogic/common/resources/Bundle_ja.properties
index ab60a02..0ac4f98 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/weblogic-common/weblogic-common/org/netbeans/modules/weblogic/common/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/weblogic-common/weblogic-common/org/netbeans/modules/weblogic/common/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Web
 OpenIDE-Module-Name=Oracle WebLogic\u5171\u901a
 OpenIDE-Module-Short-Description=\u69d8\u3005\u306aWebLogic\u95a2\u9023\u6a5f\u80fd\u3092\u63d0\u4f9b\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/Bundle_ja.properties
index 74e2957..b5ffa83 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/Bundle_ja.properties
@@ -1,45 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-# Sample ResourceBundle properties file
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=WebSocket\u30b5\u30dd\u30fc\u30c8\u7528\u306eJava API
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/editor/Bundle_ja.properties
index 177e6dd..633b98e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/editor/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 TXT_AddWebScoketMethod=WebSocket\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8\u306b{0}\u30e1\u30bd\u30c3\u30c9\u3092\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/wizard/Bundle_ja.properties
index 8938101..1e4d4aa 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/wizard/Bundle_ja.properties
@@ -1,45 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-# Sample ResourceBundle properties file
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/JSP_Servlet/WSEndpoint.java=WebSocket\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/wizard/resources/WebSocket_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/wizard/resources/WebSocket_ja.html
index b2824cc..ad8c481 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/wizard/resources/WebSocket_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websocket/websocket/org/netbeans/modules/websocket/wizard/resources/WebSocket_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/api/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/api/client/Bundle_ja.properties
index 5694603..e058e64 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/api/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/api/client/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ERR_NoJaxrpcPluginFound=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306bJAX-RPC\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002JAX-RPC Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/client/Bundle_ja.properties
index 6681812..840a16c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/client/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8SPI/API
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Short-Description=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30b3\u30f3\u30b7\u30e5\u30fc\u30de\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u7528\u306eSPI\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/spi/jaxws/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/spi/jaxws/client/Bundle_ja.properties
index 029dff0..1181d63 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/spi/jaxws/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-clientapi/websvc-clientapi/org/netbeans/modules/websvc/spi/jaxws/client/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_CannotGenerateClient=JAXWS:wsimport\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u3067Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002\n\u7406\u7531: {0}\n\nJava\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306e\u4f5c\u6210\u4e2d\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u305f\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059(\u751f\u6210\u3055\u308c\u305f\u30af\u30e9\u30b9\u9593\u3067\u306e\u540d\u524d\u306e\u7af6\u5408\u306a\u3069)\u3002\n\u554f\u984c\u3092\u691c\u51fa\u3059\u308b\u306b\u306f\u3001\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u8868\u793a\u3055\u308c\u308b\u30a8\u30e9\u30fc\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u3082\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\u300cWSDL\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u300d\u30c0\u30a4\u30a2\u30ed\u30b0\u3067\u554f\u984c\u3092\u89e3\u6c7a\u3067\u304d\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\n(\u300cWeb\u30b5\u30fc\u30d3\u30b9\u5c5e\u6027\u3092\u7de8\u96c6\u300d\u30a2\u30af\u30b7\u30e7\u30f3)\u3002\n\u307e\u305f\u3001JAXB\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3092\u4f7f\u7528\u3057\u3066\u30ed\u30fc\u30ab\u30eb\u306eWSDL\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30b9\u30ad\u30fc\u30de\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u624b\u52d5\u3067\u7de8\u96c6\u3057\u3066\u89e3\u6c7a\u3067\u304d\u308b\u5834\u5408\u3082\u3042\u308a\u307e\u3059\n(\u30ed\u30fc\u30ab\u30eb\u306eWSDL\u30d5\u30a1\u30a4\u30eb\u3068\u30b9\u30ad\u30fc\u30de\u30fb\u30d5\u30a1\u30a4\u30eb\u306f\u3001xml-resources\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u3042\u308a\u307e\u3059)\u3002\n\n\u554f\u984c\u3092\u89e3\u6c7a\u3057\u305f\u3089\u3001\u300cWeb\u30b5\u30fc\u30d3\u30b9\u53c2\u7167\u300d\u30ce\u30fc\u30c9\u304b\u3089\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 ERR_IncorrectURI=URI\u69cb\u6587\u30a8\u30e9\u30fc: {0}
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/Bundle_ja.properties
index 30db778..4c7c92b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30b3\u30a2
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/actions/Bundle_ja.properties
index 4b61217..16802d9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #AddOperationActionGenerator
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/resources/WebServiceClient_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/resources/WebServiceClient_ja.html
index f9393b1..4705049 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/resources/WebServiceClient_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/resources/WebServiceClient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/wizard/Bundle_ja.properties
index 20dcd33..90354bb 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/client/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Web Service Client resource bundle
 Templates/WebServices=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler_ja.html
index 7019ab5..5e70459 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/LogicalHandler_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/MessageHandler_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/MessageHandler_ja.html
index aa6a8ce..1129c5f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/MessageHandler_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/MessageHandler_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebServiceFromWSDL_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebServiceFromWSDL_ja.html
index cdacbb5..f31be90 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebServiceFromWSDL_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebServiceFromWSDL_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebService_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebService_ja.html
index 22639d9..b38f61f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebService_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/resources/WebService_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/wizard/Bundle_ja.properties
index bfa3e8e..7a5e58d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/dev/wizard/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 LBL_SpecifyWSInfo=Web\u30b5\u30fc\u30d3\u30b9\u60c5\u5831\u3092\u6307\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/Bundle_ja.properties
index bfd91fb..3675f3d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/Bundle_ja.properties
@@ -1,29 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # The Original Software is NetBeans. The Initial Developer of the Original
 # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/actions/Bundle_ja.properties
index 99f5993..484eda7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_OperationAction=\u64cd\u4f5c\u306e\u8ffd\u52a0...
 TITLE_OperationAction=\u64cd\u4f5c\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle_ja.properties
index 7932502..4fca2d7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_WebServices=Web\u30b5\u30fc\u30d3\u30b9
 LBL_ServiceReferences=Web\u30b5\u30fc\u30d3\u30b9\u53c2\u7167
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/projects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/projects/Bundle_ja.properties
index 08ad2ab..b8a1f4f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/projects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/projects/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ErrorSavingOnWSClientAdd=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8''{0}''\u306e\u8ffd\u52a0\u5f8c\u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4fdd\u5b58\u30a8\u30e9\u30fc\u3002\n\u30e1\u30c3\u30bb\u30fc\u30b8: {1}\n
 MSG_RemoveJAX-RPC=\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u7af6\u5408\u3092\u907f\u3051\u308b\u305f\u3081\u3001JAX-RPC 1.6\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30af\u30e9\u30b9\u30fb\u30d1\u30b9\u304b\u3089\u524a\u9664\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u524a\u9664\u3059\u308b\u306b\u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30ce\u30fc\u30c9\u3001\u300c\u30d7\u30ed\u30d1\u30c6\u30a3\u300d\u3001\u300c\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30ab\u30b9\u30bf\u30de\u30a4\u30b6\u300d\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/saas/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/saas/Bundle_ja.properties
index f0fa678..6cd2a39 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/saas/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/jaxws/saas/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_CONFIRM_DELETE=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002\u7d9a\u884c\u3059\u308b\u3068\u3001\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u4e0a\u66f8\u304d\u3055\u308c\u307e\u3059\u3002\n\u7d9a\u884c\u3057\u307e\u3059\u304b?
 TITLE_CONFIRM_DELETE=\u524a\u9664\u306e\u78ba\u8a8d
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/webservices/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/webservices/ui/Bundle_ja.properties
index b341237..d231c35 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/webservices/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/webservices/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DeleteEJBConfirmation
 MSG_ConfirmDeleteObject={0}\u30b5\u30fc\u30d3\u30b9\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/webservices/ui/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/webservices/ui/panels/Bundle_ja.properties
index b05243d..5792e0a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/webservices/ui/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/webservices/ui/panels/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #EnterWSDLUrlPanel
 LBL_Input_WSDL_Url=\u30c7\u30d7\u30ed\u30a4\u6e08Web\u30b5\u30fc\u30d3\u30b9\u306eWSDL URL\u3092\u5165\u529b:
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/wseditor/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/wseditor/support/Bundle_ja.properties
index 97c286f..7873787 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/wseditor/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/core/wseditor/support/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_EditAttributesAction=Web\u30b5\u30fc\u30d3\u30b9\u5c5e\u6027\u3092\u7de8\u96c6...
 CTL_EditWSAttributesAction=EditWSAttributes\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u958b\u304f
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/editor/completion/Bundle_ja.properties
index 4fe7326..6d2e42b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-core/websvc-core/org/netbeans/modules/websvc/editor/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 scanning-in-progress=\u30b9\u30ad\u30e3\u30f3\u4e2d...
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/Bundle_ja.properties
index adc5896..8c4e233 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JAX-WS\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/core/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/core/ui/Bundle_ja.properties
index f70775e..9265b37 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/core/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/core/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_EditAttributesAction=Web\u30b5\u30fc\u30d3\u30b9\u5c5e\u6027\u3092\u7de8\u96c6...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/jaxwssettings/panel/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/jaxwssettings/panel/Bundle_ja.properties
index e1494b1..8fa043f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/jaxwssettings/panel/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/jaxwssettings/panel/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 JaxwsSettingsPanel.wsimportOptionLbl.text=Wsimport\u30aa\u30d7\u30b7\u30e7\u30f3
 JaxwsSettingsPanel.soapVersionLbl.text=SOAP\u30d0\u30fc\u30b8\u30e7\u30f3
 JaxwsSettingsPanel.useDispatchBtn.text=\u30c7\u30a3\u30b9\u30d1\u30c3\u30c1\u306e\u4f7f\u7528
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/light/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/light/Bundle_ja.properties
index dfb3b61..d921ed1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/light/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/light/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_Refreshing=\u4fdd\u5b58\u3057\u3066\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3057\u3066\u3044\u307e\u3059...
 TITLE_WSDL_CUSTOMIZATION=WSDL\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/multiview/Bundle_ja.properties
index 1cb68d0..6c20f55 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-customization/websvc-customization/org/netbeans/modules/websvc/customization/multiview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Sample ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/Bundle_ja.properties
index 1604998..a2ce038 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30c7\u30b6\u30a4\u30f3\u30fb\u30d3\u30e5\u30fc
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/javamodel/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/javamodel/Bundle_ja.properties
index 46eb9b4..5efe3ac 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/javamodel/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/javamodel/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_SAAJ_PROBLEM=javax.xml.soap.MessageFactory\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002IDE\u3067\u4f7f\u7528\u3055\u308c\u3066\u3044\u308bSAAJ\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3068\u3001JDK\u306b\u30d0\u30f3\u30c9\u30eb\u3055\u308c\u3066\u3044\u308bSAAJ\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u30af\u30e9\u30b9\u306e\u7af6\u5408\u304c\u539f\u56e0\u306e\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/loader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/loader/Bundle_ja.properties
index 486ad09..4e66f66 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/loader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/loader/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PROP_JaxWsLoader_Name=JaxWs Web\u30b5\u30fc\u30d3\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/multiview/Bundle_ja.properties
index 98ac51e..b20d1f1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/multiview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_designView_name=\u30c7\u30b6\u30a4\u30f3
 LBL_sourceView_name=\u30bd\u30fc\u30b9
 LBL_wsdlPreview_name=\u30d7\u30ec\u30d3\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/navigator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/navigator/Bundle_ja.properties
index ed198ce..f5114ef 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/navigator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/navigator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_WSDesignNavigatorPanel_Name=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30c7\u30b6\u30a4\u30f3
 LBL_WSDesignNavigatorPanel_Hint=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30c7\u30b6\u30a4\u30f3\u30fb\u30ca\u30d3\u30b2\u30fc\u30bf
 LBL_Operations=\u64cd\u4f5c
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/Bundle_ja.properties
index d60a981..6f5c915 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/actions/Bundle_ja.properties
index e431cd0..ce9405b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/actions/Bundle_ja.properties
@@ -1,33 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #AddOperationAction
 LBL_AddOperation=\u64cd\u4f5c\u306e\u8ffd\u52a0...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/widget/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/widget/Bundle_ja.properties
index af83669..3174f57 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/widget/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-design/websvc-design/org/netbeans/modules/websvc/design/view/widget/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_Operations = \u64cd\u4f5c
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/fixes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/fixes/Bundle_ja.properties
index 19e52bb..d4e9e47 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/fixes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/fixes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 isOpeartion
-# made subject to such option by the copyright holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_RemoveAnnotation={0}\u6ce8\u91c8\u306e\u524a\u9664
 LBL_AddAnnotation={0}\u6ce8\u91c8\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/resources/Bundle_ja.properties
index 51dbf3f..5fb74ad 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Long-Description=JAXWS Web\u30b5\u30fc\u30d3\u30b9\u306bJSR 181\u30d9\u30fc\u30b9\u306e\u30d2\u30f3\u30c8\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30a8\u30c7\u30a3\u30bf\u306e\u30d2\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/rules/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/rules/Bundle_ja.properties
index 067173d..e77183f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/rules/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-editor-hints/websvc-editor-hints/org/netbeans/modules/websvc/editor/hints/rules/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_IF_ServiceNameNotAllowed=\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u306bserviceName\u5c5e\u6027\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
 MSG_IF_SEINotAllowed=\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u306bendpointInterface\u5c5e\u6027\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxws-lightapi/websvc-jaxws-lightapi/org/netbeans/modules/websvc/jaxws/light/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxws-lightapi/websvc-jaxws-lightapi/org/netbeans/modules/websvc/jaxws/light/Bundle_ja.properties
index 283e4c9..edd1d66 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxws-lightapi/websvc-jaxws-lightapi/org/netbeans/modules/websvc/jaxws/light/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxws-lightapi/websvc-jaxws-lightapi/org/netbeans/modules/websvc/jaxws/light/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JAX-WS\u8efd\u91cfSPI/API
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsapi/websvc-jaxwsapi/org/netbeans/modules/websvc/jaxws/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsapi/websvc-jaxwsapi/org/netbeans/modules/websvc/jaxws/Bundle_ja.properties
index 3b4413c..1df3db1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsapi/websvc-jaxwsapi/org/netbeans/modules/websvc/jaxws/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsapi/websvc-jaxwsapi/org/netbeans/modules/websvc/jaxws/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JAX-WS\u30b5\u30fc\u30d3\u30b9\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0\u306eSPI/API
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsapi/websvc-jaxwsapi/org/netbeans/modules/websvc/jaxws/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsapi/websvc-jaxwsapi/org/netbeans/modules/websvc/jaxws/spi/Bundle_ja.properties
index 9cafb77..75786e7 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsapi/websvc-jaxwsapi/org/netbeans/modules/websvc/jaxws/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsapi/websvc-jaxwsapi/org/netbeans/modules/websvc/jaxws/spi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_MISSING_SRC_CONF=XML\u30a2\u30fc\u30c1\u30d5\u30a1\u30af\u30c8\u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306b\u5fc5\u8981\u306a\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u3042\u308a\u307e\u305b\u3093\u3002Java EE\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30bf\u30a4\u30d7\u3067\u306f\u3001\n\u3053\u308c\u306f"conf.dir"\u30d7\u30ed\u30d1\u30c6\u30a3(nbproject/project.properties\u30d5\u30a1\u30a4\u30eb)\u3067\u6307\u5b9a\u3055\u308c\u308b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u3059\u3002\n\u3053\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306f\u901a\u5e38\u3001"src/conf"\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u624b\u52d5\u3067\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/customization/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/customization/model/Bundle_ja.properties
index 4c2e52a..90ccaad 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/customization/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/customization/model/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Name=JAX-WS\u30ab\u30b9\u30bf\u30de\u30a4\u30baAPI
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/project/Bundle_ja.properties
index d7c023a..a01672b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/wsdlmodel/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/wsdlmodel/Bundle_ja.properties
index 4c0282e..8b2e60b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/wsdlmodel/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/api/jaxws/wsdlmodel/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_asyncPolling=\u975e\u540c\u671f\u30dd\u30fc\u30ea\u30f3\u30b0
 TXT_asyncCallback=\u975e\u540c\u671f\u30b3\u30fc\u30eb\u30d0\u30c3\u30af
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/jaxwsmodel/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/jaxwsmodel/project/Bundle_ja.properties
index a8594d9..a8104cd 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/jaxwsmodel/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/jaxwsmodel/project/Bundle_ja.properties
@@ -1,29 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # The Original Software is NetBeans. The Initial Developer of the Original
 # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/jaxwsmodel/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/jaxwsmodel/resources/Bundle_ja.properties
index 4802aa4..420c016 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/jaxwsmodel/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-jaxwsmodel/websvc-jaxwsmodel/org/netbeans/modules/websvc/jaxwsmodel/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JAX-WS\u30e2\u30c7\u30eb
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-kit/websvc-kit/org/netbeans/modules/websvc/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-kit/websvc-kit/org/netbeans/modules/websvc/kit/Bundle_ja.properties
index 6296d21..d709b83 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-kit/websvc-kit/org/netbeans/modules/websvc/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-kit/websvc-kit/org/netbeans/modules/websvc/kit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/Bundle_ja.properties
index ac95c38..f4d8b09 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001\u65e2\u77e5\u306eWeb\u30b5\u30fc\u30d3\u30b9\u3092IDE\u5168\u4f53\u306b\u767b\u9332\u3067\u304d\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002\u307e\u305f\u3001\u7570\u306a\u308b\u30bf\u30a4\u30d7\u306e\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306b\u3088\u308b\u6d88\u8cbb\u306b\u5fc5\u8981\u306a\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306e\u4e8b\u524d\u4f5c\u6210\u306b\u5f79\u7acb\u3061\u307e\u3059\u3002\n\n\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001\u6d88\u8cbb\u5074\u304c\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306e\u6e96\u5099\u306b\u53c2\u52a0\u3059\u308b\u305f\u3081\u306eAPI\u3068SPI\u3092\u516c\u958b\u3057\u307e\u3059\u3002\u307e\u305f\u3001\u30b5\u30fc\u30d3\u30b9\u3092\u6d88\u8cbb\u3059\u308b\u30b3\u30fc\u30c9\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3092\u516c\u958b\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/codegen/Bundle_ja.properties
index 00e80ce..f77a51c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/codegen/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CODEGEN_ERROR_JAXWS=\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3001JAX-WS\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u751f\u6210\u30a8\u30e9\u30fc\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u306eWeb\u30b5\u30fc\u30d3\u30b9\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306fJava EE 5\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u4f7f\u7528\u3067\u304d\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
 CODEGEN_ERROR_JAXRPC=\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3001JAX-RPC\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u751f\u6210\u30a8\u30e9\u30fc\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u306eWeb\u30b5\u30fc\u30d3\u30b9\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306fJ2EE 1.4\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u4f7f\u7528\u3067\u304d\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/model/Bundle_ja.properties
index 0cee9b4..e80695a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/model/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 INVALID_URL=\u6307\u5b9a\u3055\u308c\u305fWSDL URL\u306f\u6709\u52b9\u306aURL\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/ui/Bundle_ja.properties
index d5cbc47..b2676e5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_WsdlSource=Web\u30b5\u30fc\u30d3\u30b9\u306eWSDL\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306fWADL\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002(&S)
 LBL_WsdlSourceFilesystem=\u30ed\u30fc\u30ab\u30eb\u30fb\u30d5\u30a1\u30a4\u30eb(&L):
 LBL_Browse=\u53c2\u7167(&R)...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/util/Bundle_ja.properties
index 5d444bc..e38109c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-manager/websvc-manager/org/netbeans/modules/websvc/manager/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ADD_WEB_SERVICE=Web\u30b5\u30fc\u30d3\u30b9\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-lib/websvc-metro-lib/org/netbeans/modules/websvc/metro/lib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-lib/websvc-metro-lib/org/netbeans/modules/websvc/metro/lib/Bundle_ja.properties
index e2d0832..39992c0 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-lib/websvc-metro-lib/org/netbeans/modules/websvc/metro/lib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-lib/websvc-metro-lib/org/netbeans/modules/websvc/metro/lib/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module descritpion
 OpenIDE-Module-Name=Metro 2.0\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/Bundle_ja.properties
index 09277be..0ad1148 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=metro.xml\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210\u30e2\u30c7\u30eb
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9\u76f8\u4e92\u904b\u7528\u6027
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/ui/Bundle_ja.properties
index 15251af..b6a7f7d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-model/websvc-metro-model/org/netbeans/modules/websvc/metro/model/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_WebServices=Web\u30b5\u30fc\u30d3\u30b9
 LBL_Tubelines=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eTubeline
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/Bundle_ja.properties
index 6cbb9fb..104421e 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 ## manifest.mf
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/Calculator_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/Calculator_ja.html
index ebe85f2..5f3c988 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/Calculator_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/Calculator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.1 Transitional//EN">
 <html><head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/SecureCalculator_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/SecureCalculator_ja.html
index 67f5adc..eb98f02 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/SecureCalculator_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/SecureCalculator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.1 Transitional//EN">
 <html><head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/metroSamplesCategory_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/metroSamplesCategory_ja.html
index efcb8a5..bece8c9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/metroSamplesCategory_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-metro-samples/websvc-metro-samples/org/netbeans/modules/websvc/metro/samples/descriptions/metroSamplesCategory_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-owsm/websvc-owsm/org/netbeans/modules/websvc/owsm/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-owsm/websvc-owsm/org/netbeans/modules/websvc/owsm/Bundle_ja.properties
index 82be7c8..d59e714 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-owsm/websvc-owsm/org/netbeans/modules/websvc/owsm/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-owsm/websvc-owsm/org/netbeans/modules/websvc/owsm/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-projectapi/websvc-projectapi/org/netbeans/modules/websvc/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-projectapi/websvc-projectapi/org/netbeans/modules/websvc/project/Bundle_ja.properties
index df258a3..165dee1 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-projectapi/websvc-projectapi/org/netbeans/modules/websvc/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-projectapi/websvc-projectapi/org/netbeans/modules/websvc/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8API
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/Bundle_ja.properties
index 721620c..2a5db57 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=RESTful Web\u30b5\u30fc\u30d3\u30b9\u306e\u30b5\u30f3\u30d7\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBClientSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBClientSampleDescription_ja.html
index 632966d..d0ab980 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBClientSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBClientSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBSampleDescription_ja.html
index 55293f5..9e4b136 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBSpringSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBSpringSampleDescription_ja.html
index 86040eb..9b56acd 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBSpringSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/CustomerDBSpringSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/HelloWorldSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/HelloWorldSampleDescription_ja.html
index 28b4a44..c88ac20 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/HelloWorldSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/HelloWorldSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/LeanServiceECBComponentWithAjax_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/LeanServiceECBComponentWithAjax_ja.html
index 2431b19..07b1e97 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/LeanServiceECBComponentWithAjax_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/LeanServiceECBComponentWithAjax_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/MessageBoardSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/MessageBoardSampleDescription_ja.html
index 57018be..548558a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/MessageBoardSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/MessageBoardSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/RestRCPMvnAppSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/RestRCPMvnAppSampleDescription_ja.html
index 88fb1ea..5a8837c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/RestRCPMvnAppSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/RestRCPMvnAppSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/category_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/category_ja.html
index 85be763..b8dad07 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/category_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/resources/category_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/ui/Bundle_ja.properties
index 7148781..f44cb5d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest-samples/websvc-rest-samples/org/netbeans/modules/websvc/rest/samples/ui/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CreateProjectStep=\u540d\u524d\u3068\u5834\u6240
 #SampleWizardIterator
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/client/Bundle_ja.properties
index 80d98b6..abb3393 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/client/Bundle_ja.properties
@@ -1,29 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # The Original Software is NetBeans. The Initial Developer of the Original
 # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/codegen/Bundle_ja.properties
index 97688bd..f01ec0c 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/codegen/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 MSG_GeneratingClass={0}\u3092\u751f\u6210\u3057\u3066\u3044\u307e\u3059...
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/editor/Bundle_ja.properties
index b0b1505..7eed818 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/editor/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 MSG_HintJerseyServlet=Jersey\u56fa\u6709\u306e\u6a5f\u80fd\u3092\u4f7f\u7528\u3057\u3066REST\u3092\u69cb\u6210
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/nodes/Bundle_ja.properties
index 38d3b06..8d49517 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/nodes/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 LBL_RestServices=RESTful Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/projects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/projects/Bundle_ja.properties
index b84845a..68303ec 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/projects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/projects/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 LBL_TestRestBeansAction_Name=RESTful Web\u30b5\u30fc\u30d3\u30b9\u3092\u30c6\u30b9\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/resources/Bundle_ja.properties
index 103b530..83f719a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/resources/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Name=RESTful Web\u30b5\u30fc\u30d3\u30b9\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/support/Bundle_ja.properties
index d527182..5a02e6a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/support/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TestRestTargetPanel.myRemote.actionCommand=Web\u30c6\u30b9\u30c8\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8(&W)
 TTL_SelectTarget=REST\u30c6\u30b9\u30c8\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u69cb\u6210
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/Bundle_ja.properties
index c091604..aa93eac 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 Templates/WebServices=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/DatabaseResource_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/DatabaseResource_ja.html
index 5bc9075..e479e69 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/DatabaseResource_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/DatabaseResource_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/EntityResources_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/EntityResources_ja.html
index 7ce21f5..cc94469 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/EntityResources_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/EntityResources_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JaxRsFilter_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JaxRsFilter_ja.html
index 3d0cf1a..05883ff 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JaxRsFilter_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JaxRsFilter_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JaxRsInterceptor_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JaxRsInterceptor_ja.html
index d9172a6..76d01be 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JaxRsInterceptor_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JaxRsInterceptor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JerseyClientWizard_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JerseyClientWizard_ja.html
index 693a6a7..1507c0b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JerseyClientWizard_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/JerseyClientWizard_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/OriginResourceFilter_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/OriginResourceFilter_ja.html
index ee998ac..a2353b5 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/OriginResourceFilter_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/OriginResourceFilter_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/PatternResources_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/PatternResources_ja.html
index d0d6130..7357e3b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/PatternResources_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-rest/websvc-rest/org/netbeans/modules/websvc/rest/wizard/resources/PatternResources_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/resources/Bundle_ja.properties
index 56cb43c..53885a6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/resources/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Name=RESTful Web\u30b5\u30fc\u30d3\u30b9\u306e\u30b5\u30dd\u30fc\u30c8API/SPI
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/spi/Bundle_ja.properties
index 31d7541..e764e77 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-restapi/websvc-restapi/org/netbeans/modules/websvc/rest/spi/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # ResourceBundle properties file for Translating messages in the REST Test Client
 
 ##
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-restkit/websvc-restkit/org/netbeans/modules/websvc/restkit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-restkit/websvc-restkit/org/netbeans/modules/websvc/restkit/Bundle_ja.properties
index 3bbc8bc..d0edb8b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-restkit/websvc-restkit/org/netbeans/modules/websvc/restkit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-restkit/websvc-restkit/org/netbeans/modules/websvc/restkit/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Display-Category=Java Web\u304a\u3088\u3073EE
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-restlib/websvc-restlib/org/netbeans/modules/websvc/swdp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-restlib/websvc-restlib/org/netbeans/modules/websvc/swdp/Bundle_ja.properties
index aab7ba1..54080ba 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-restlib/websvc-restlib/org/netbeans/modules/websvc/swdp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-restlib/websvc-restlib/org/netbeans/modules/websvc/swdp/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module descritpion
 OpenIDE-Module-Name=RESTful Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-saas-codegen-j2ee/websvc-saas-codegen-j2ee/org/netbeans/modules/websvc/saas/codegen/j2ee/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-saas-codegen-j2ee/websvc-saas-codegen-j2ee/org/netbeans/modules/websvc/saas/codegen/j2ee/Bundle_ja.properties
index cc7a960..84ece4a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-saas-codegen-j2ee/websvc-saas-codegen-j2ee/org/netbeans/modules/websvc/saas/codegen/j2ee/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-saas-codegen-j2ee/websvc-saas-codegen-j2ee/org/netbeans/modules/websvc/saas/codegen/j2ee/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Name=Java EE\u7528SaaS\u30b5\u30fc\u30d3\u30b9\u30fb\u30b3\u30fc\u30c9\u751f\u6210
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/api/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/api/support/Bundle_ja.properties
index d2d0448..ca6aea3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/api/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/api/support/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ConfirmServiceRefresh=\u30b5\u30fc\u30d3\u30b9\u306e\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3092\u78ba\u8a8d
 MSG_ConfirmClientRefresh=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306e\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3092\u78ba\u8a8d
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/spi/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/spi/support/Bundle_ja.properties
index 3428e88..01c22a8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/spi/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/spi/support/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_AvailableWebServices=\u4f7f\u7528\u53ef\u80fd\u306aWeb\u30b5\u30fc\u30d3\u30b9\u53c2\u7167(&W):
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/utilities/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/utilities/Bundle_ja.properties
index 5187378..a0623b6 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/utilities/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/utilities/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/utilities/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/utilities/ui/Bundle_ja.properties
index db287c6..937bfa2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/utilities/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-utilities/websvc-utilities/org/netbeans/modules/websvc/utilities/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # SelectHandlerPanel
 LBL_Class_Tree=\u30e1\u30c3\u30bb\u30fc\u30b8\u30fb\u30cf\u30f3\u30c9\u30e9\u30fb\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-websvcapi/websvc-websvcapi/org/netbeans/modules/websvc/api/webservices/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-websvcapi/websvc-websvcapi/org/netbeans/modules/websvc/api/webservices/Bundle_ja.properties
index 8b9a3c1..00db9e2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-websvcapi/websvc-websvcapi/org/netbeans/modules/websvc/api/webservices/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-websvcapi/websvc-websvcapi/org/netbeans/modules/websvc/api/webservices/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ERR_NoJaxrpcPluginFound=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306bJAX-RPC\u30b5\u30fc\u30d3\u30b9\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002JAX-RPC\u30b5\u30dd\u30fc\u30c8\u30fb\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-websvcapi/websvc-websvcapi/org/netbeans/modules/websvc/webservices/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-websvcapi/websvc-websvcapi/org/netbeans/modules/websvc/webservices/Bundle_ja.properties
index e11efe3..541f001 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-websvcapi/websvc-websvcapi/org/netbeans/modules/websvc/webservices/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-websvcapi/websvc-websvcapi/org/netbeans/modules/websvc/webservices/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JAX-RPC\u30b5\u30fc\u30d3\u30b9\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0\u306eSPI/API
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Short-Description=JAX-RPC\u30b5\u30fc\u30d3\u30b9\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0\u3067\u3042\u308b\u30e2\u30b8\u30e5\u30fc\u30eb\u306eSPI\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/Bundle_ja.properties
index 09c7109..5f9a213 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Web\u30b5\u30fc\u30d3\u30b9\u76f8\u4e92\u904b\u7528\u6027\u30c6\u30af\u30ce\u30ed\u30b8\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9\u76f8\u4e92\u904b\u7528\u6027
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/design/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/design/Bundle_ja.properties
index 3cbf807..b0cc44f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/design/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/design/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DesignConfigPanel.mtomCB.text=\u30d0\u30a4\u30ca\u30ea\u30fb\u30c7\u30fc\u30bf\u306e\u8ee2\u9001\u306e\u6700\u9069\u5316(MTOM)
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/projects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/projects/Bundle_ja.properties
index e540a9b..42905dd 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/projects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/projects/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SECCONSTRAINT_DNAME={0}\u306eSSL\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/refactoring/Bundle_ja.properties
index 9dad316..913b16d 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/refactoring/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_WsitXmlClassRename=WSIT\u69cb\u6210\u30d5\u30a1\u30a4\u30eb{0}\u306e\u540d\u524d\u304c{1}\u306b\u5909\u66f4\u3055\u308c\u307e\u3059
 TXT_WsitXmlMethodRename=WSIT\u69cb\u6210\u30d5\u30a1\u30a4\u30eb{0}\u5185\u306e\u30e1\u30bd\u30c3\u30c9\u53c2\u7167\u306e\u540d\u524d\u304c{1}\u306b\u5909\u66f4\u3055\u308c\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/resources/STSWizard_ja.html b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/resources/STSWizard_ja.html
index 0127cee..e908468 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/resources/STSWizard_ja.html
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/resources/STSWizard_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/Bundle_ja.properties
index e83a77a..152c806 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACS_Tab_DESC=\u30a8\u30e9\u30fc\u30fb\u30bf\u30d6
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/Bundle_ja.properties
index 18ab78d..3f6cf0b 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACS_Tab_DESC={0} ACS_Tab_DESC
 LBL_Binding={0}\u7d50\u5408
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/nodes/Bundle_ja.properties
index 236c01d..8dcedb9 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/nodes/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Section_STS_Client=\u30bb\u30ad\u30e5\u30a2\u30fb\u30c8\u30fc\u30af\u30f3\u30fb\u30b5\u30fc\u30d3\u30b9
 LBL_Section_Callback_Client=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/subpanels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/subpanels/Bundle_ja.properties
index 3451476..0783ab3 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/subpanels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/client/subpanels/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_DefaultUsernameLabel=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30e6\u30fc\u30b6\u30fc\u540d(&U):
 LBL_DefaultPasswordLabel=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30d1\u30b9\u30ef\u30fc\u30c9(&P):
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/nodes/Bundle_ja.properties
index 1b90499..744f412 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/nodes/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/Bundle_ja.properties
index 71d6b95..91d9dd8 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACS_Tab_DESC={0} ACS_Tab_DESC
 TXT_AMSecSelected=WSIT\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u3092\u6709\u52b9\u306b\u3067\u304d\u307e\u305b\u3093\u3002\u4e92\u63db\u6027\u304c\u306a\u3044\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u8a2d\u5b9a\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002\u305f\u3068\u3048\u3070\u3001Access Manager\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u304c\u6709\u52b9\u306b\u306a\u3063\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/profiles/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/profiles/Bundle_ja.properties
index a1ae7fa..55684df 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/profiles/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/profiles/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_AuthToken=\u8a8d\u8a3c\u30c8\u30fc\u30af\u30f3:
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/Bundle_ja.properties
index 60e98a4..a7d06de 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/ui/service/subpanels/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_AdvancedRM_maxBufLabel=\u6700\u5927\u30d5\u30ed\u30fc\u5236\u5fa1\u30d0\u30c3\u30d5\u30a1\u30fb\u30b5\u30a4\u30ba:
 LBL_AdvancedRM_InactivityTimeoutLabel=\u975e\u30a2\u30af\u30c6\u30a3\u30d6\u30fb\u30bf\u30a4\u30e0\u30fb\u30a2\u30a6\u30c8(\u30df\u30ea\u79d2):
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/util/Bundle_ja.properties
index fc135ea..75d42bd 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/util/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_AddLibraries=QoS\u6a5f\u80fd\u306f\u3001METRO\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u30af\u30e9\u30b9\u30d1\u30b9\u4e2d\u306b\u5b58\u5728\u3059\u308b\u3053\u3068\u3092\u5fc5\u8981\u3068\u3057\u307e\u3059\u3002\u3057\u304b\u3057\u306a\u304c\u3089\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u307e\u305f\u306f\u5bfe\u8c61\u30b5\u30fc\u30d0\u30fc\u5185\u306bMETRO\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306bMETRO\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u8ffd\u52a0\u3057\u305f\u3044\u5834\u5408\u306f\u300c\u306f\u3044\u300d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u306e\u3068\u304d\u3082\u3057JAX-WS\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u5b58\u5728\u3059\u308c\u3070\u305d\u308c\u3092\u524a\u9664\u3057\u307e\u3059\u304c\u3001\u3053\u308c\u306fJAX-WS\u304c\u65e2\u306bMETRO\u306b\u542b\u307e\u308c\u3066\u3044\u308b\u304b\u3089\u3067\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/wizard/Bundle_ja.properties
index f3aae59..202f6fe 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/wizard/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/WebServices=Web\u30b5\u30fc\u30d3\u30b9
 Templates/WebServices/STSWizard.java=\u30bb\u30ad\u30e5\u30a2\u30fb\u30c8\u30fc\u30af\u30f3\u30fb\u30b5\u30fc\u30d3\u30b9(STS)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/Bundle_ja.properties
index d9c9b2d..9101a1a 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitconf/websvc-wsitconf/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SECCONSTRAINT_DNAME={0}\u306eSSL\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8 
 
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitmodelext/websvc-wsitmodelext/org/netbeans/modules/websvc/wsitmodelext/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitmodelext/websvc-wsitmodelext/org/netbeans/modules/websvc/wsitmodelext/Bundle_ja.properties
index 3768949..6fcd96f 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitmodelext/websvc-wsitmodelext/org/netbeans/modules/websvc/wsitmodelext/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitmodelext/websvc-wsitmodelext/org/netbeans/modules/websvc/wsitmodelext/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Web\u30b5\u30fc\u30d3\u30b9\u76f8\u4e92\u904b\u7528\u6027\u30c6\u30af\u30ce\u30ed\u30b8WSDL\u62e1\u5f35
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9\u76f8\u4e92\u904b\u7528\u6027
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitmodelext/websvc-wsitmodelext/org/netbeans/modules/websvc/wsitmodelext/versioning/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitmodelext/websvc-wsitmodelext/org/netbeans/modules/websvc/wsitmodelext/versioning/Bundle_ja.properties
index 4847f69..f7a07b2 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitmodelext/websvc-wsitmodelext/org/netbeans/modules/websvc/wsitmodelext/versioning/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsitmodelext/websvc-wsitmodelext/org/netbeans/modules/websvc/wsitmodelext/versioning/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CONFIG_1_0=.NET 3.0/METRO 1.0 (METRO 1.0\u4ee5\u964d\u304c\u5fc5\u8981)
 CONFIG_1_3=.NET 3.5/METRO 1.3 (METRO 1.3\u4ee5\u964d\u304c\u5fc5\u8981)
diff --git a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsstackapi/websvc-wsstackapi/org/netbeans/modules/websvc/wsstack/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsstackapi/websvc-wsstackapi/org/netbeans/modules/websvc/wsstack/Bundle_ja.properties
index a579e3c..750bb98 100755
--- a/netbeans-l10n-zip/src/ja/enterprise/websvc-wsstackapi/websvc-wsstackapi/org/netbeans/modules/websvc/wsstack/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/enterprise/websvc-wsstackapi/websvc-wsstackapi/org/netbeans/modules/websvc/wsstack/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=WS\u30b9\u30bf\u30c3\u30afAPI
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/Bundle_ja.properties
index 54ff8e8..e7c473d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=IDE\u306e\u6a5f\u80fd\u3092\u52d5\u7684\u306b\u6709\u52b9\u306b\u3057\u307e\u3059\u3002\u5b8c\u5168\u306aIDE\u30c7\u30a3\u30b9\u30c8\u30ea\u30d3\u30e5\u30fc\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u305f\u3053\u3068\u306b\u3088\u308a\u30e6\u30fc\u30b6\u30fc\u306e\u30b7\u30b9\u30c6\u30e0\u8cc7\u6e90\u3092\u7121\u99c4\u306b\u3057\u306a\u3044\u3088\u3046\u306bn\u3001\u305d\u306e\u30b5\u30d6\u30bb\u30c3\u30c8\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30a8\u30eb\u30b4\u30ce\u30df\u30c3\u30afIDE
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/Bundle_ja.properties
index 51c4053..bf719a9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-crudsample-SampleAppDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-crudsample-SampleAppDescription_ja.html
index 992f045..dd6816b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-crudsample-SampleAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-crudsample-SampleAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-feedreader-FeedReaderDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-feedreader-FeedReaderDescription_ja.html
index 0122e83..3ed151c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-feedreader-FeedReaderDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-feedreader-FeedReaderDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-osgidemo-SampleAppDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-osgidemo-SampleAppDescription_ja.html
index d379157..3d2e632 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-osgidemo-SampleAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-osgidemo-SampleAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-osgidemo-SampleFelixDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-osgidemo-SampleFelixDescription_ja.html
index 5da4b8e..ab3681f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-osgidemo-SampleFelixDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-osgidemo-SampleFelixDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-paintapp-PaintAppDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-paintapp-PaintAppDescription_ja.html
index 9972e2c..02bd2b1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-paintapp-PaintAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-paintapp-PaintAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptyApplication_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptyApplication_ja.html
index b1a9acc..9debdfb 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptyApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptyApplication_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptyModule_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptyModule_ja.html
index 37422e9..f30762e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptyModule_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptyModule_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptySuite_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptySuite_ja.html
index 9c5346d..f9ef575 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptySuite_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-emptySuite_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-libraryModule_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-libraryModule_ja.html
index 0af2f38..dc53a17 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-libraryModule_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-resources-libraryModule_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-action-newAction_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-action-newAction_ja.html
index 6ef5464..b64c2af 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-action-newAction_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-action-newAction_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-codegenerator-newCodeGenerator_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-codegenerator-newCodeGenerator_ja.html
index a5d9c1a..d83eebb 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-codegenerator-newCodeGenerator_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-codegenerator-newCodeGenerator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-html-newHTML_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-html-newHTML_ja.html
index 2cb96c5..a0a14a9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-html-newHTML_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-html-newHTML_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-javahelp-newJavaHelp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-javahelp-newJavaHelp_ja.html
index 7412d72..c98c829 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-javahelp-newJavaHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-javahelp-newJavaHelp_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-javahint-javaHint_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-javahint-javaHint_ja.html
index 6dcc455..75413f5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-javahint-javaHint_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-javahint-javaHint_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-layer-newLayer_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-layer-newLayer_ja.html
index f09b97d..d225ef3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-layer-newLayer_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-layer-newLayer_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-librarydescriptor-emptyLibraryDescriptor_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-librarydescriptor-emptyLibraryDescriptor_ja.html
index ff48fd2..2bda884 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-librarydescriptor-emptyLibraryDescriptor_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-librarydescriptor-emptyLibraryDescriptor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-loader-newLoader_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-loader-newLoader_ja.html
index 0dac91a..bcea0c0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-loader-newLoader_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-loader-newLoader_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-moduleinstall-newModuleInstall_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-moduleinstall-newModuleInstall_ja.html
index 98a5a3d..f32a514 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-moduleinstall-newModuleInstall_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-moduleinstall-newModuleInstall_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-options-newOptions_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-options-newOptions_ja.html
index 422a7b8..a13f0dd 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-options-newOptions_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-options-newOptions_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-project-newProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-project-newProject_ja.html
index b340654..a5583a5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-project-newProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-project-newProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-quicksearch-newQuickSearch_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-quicksearch-newQuickSearch_ja.html
index cc054dd..d6589b6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-quicksearch-newQuickSearch_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-quicksearch-newQuickSearch_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-updatecenter-newUpdateCenter_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-updatecenter-newUpdateCenter_ja.html
index d9fc0d4..4af9cdf 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-updatecenter-newUpdateCenter_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-updatecenter-newUpdateCenter_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-winsys-newLayout_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-winsys-newLayout_ja.html
index 53ce0b4..9a5366a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-winsys-newLayout_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-winsys-newLayout_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-winsys-newTC_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-winsys-newTC_ja.html
index 6ad4e02..adebcf4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-winsys-newTC_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-winsys-newTC_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-wizard-newWizard_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-wizard-newWizard_ja.html
index bd48e3c..53700e2 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-wizard-newWizard_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-apisupport-project-ui-wizard-wizard-newWizard_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbAppDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbAppDescription_ja.html
index 55be485..1751a21 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbModuleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbModuleDescription_ja.html
index 0ffb618..f88a86c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbModuleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/apisupport/org-netbeans-modules-maven-apisupport-NbModuleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/Bundle_ja.properties
index 2a2cc2c..6b478e7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #project.file.nbproject/project.xml=org.netbeans.modules.cnd.makeproject.MakeBasedProjectFactorySingleton
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-asm-file_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-asm-file_ja.html
index 9713a36..82dead9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-asm-file_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-asm-file_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_ja.html
index 132b428..ad7d24a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cppunitrunner_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cppunitrunner_ja.html
index a89ba5f..c3b0312 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cppunitrunner_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cppunitrunner_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cppunittest_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cppunittest_ja.html
index de8fe4f..e619a37 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cppunittest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cppunittest_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cunittest-c_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cunittest-c_ja.html
index e6db84a..6d2c31c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cunittest-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-cunittest-c_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-test-cppunit_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-test-cppunit_ja.html
index f12ca61..ef5a920 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-test-cppunit_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-test-cppunit_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-test-cunit_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-test-cunit_ja.html
index 4e45237..e4bc2db 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-test-cunit_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-cncppunit-resources-test-cunit_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-args_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-args_ja.html
index 49af4ee..311f022 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-args_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-args_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-fractal_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-fractal_ja.html
index 69a6d72..9051be9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-fractal_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-fractal_ja.html
@@ -1,42 +1,23 @@
  <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
- -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-freeway_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-freeway_ja.html
index 32d1fb7..6118b11 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-freeway_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-freeway_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-hello_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-hello_ja.html
index 68b7830..b2c936e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-hello_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-hello_ja.html
@@ -1,42 +1,23 @@
  <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
- -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-helloapp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-helloapp_ja.html
index 14f3c6a..126100a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-helloapp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-helloapp_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-hellocmake_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-hellocmake_ja.html
index 00f4373..6565474 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-hellocmake_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-hellocmake_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-helloqt_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-helloqt_ja.html
index 327e640..ce24751 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-helloqt_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-helloqt_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-io_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-io_ja.html
index d15e565..3bebe64 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-io_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-io_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-lexyacc_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-lexyacc_ja.html
index b1147d2..651cb16 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-lexyacc_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-lexyacc_ja.html
@@ -1,42 +1,23 @@
  <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
- -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-mp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-mp_ja.html
index 2e987e7..3e5fded 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-mp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-mp_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-pi_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-pi_ja.html
index ca2b315..581838c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-pi_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-pi_ja.html
@@ -1,42 +1,23 @@
  <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
- -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-quote_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-quote_ja.html
index 7668aa3..afb62ff 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-quote_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-quote_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-welcome_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-welcome_ja.html
index bc4a91f..faf9209 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-welcome_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-resources-samples-welcome_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-binary_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-binary_ja.html
index 5673ea2..311c572 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-binary_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-binary_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-desktop_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-desktop_ja.html
index 79d9cc2..c4aac6f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-desktop_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-makefile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-makefile_ja.html
index 173a669..8fbc483 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-makefile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-makefile_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newApplication_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newApplication_ja.html
index e8b72b6..0b74616 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newApplication_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newDynamicLibrary_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newDynamicLibrary_ja.html
index ffd42f3..6b9dda7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newDynamicLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newDynamicLibrary_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtApplication_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtApplication_ja.html
index 7364ecd..4e5cde5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtApplication_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtDynamicLibrary_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtDynamicLibrary_ja.html
index def58ae..989ee23 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtDynamicLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtDynamicLibrary_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtStaticLibrary_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtStaticLibrary_ja.html
index 12eff0b..a02ff34 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtStaticLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newQtStaticLibrary_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newStaticLibrary_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newStaticLibrary_ja.html
index 7a76e10..a1c63b4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newStaticLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-newStaticLibrary_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-args_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-args_ja.html
index 09aa4b1..311f022 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-args_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-args_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ja.html
index 016c076..b4fb962 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-fractal_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-freeway_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-freeway_ja.html
index b3e615f..6118b11 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-freeway_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-freeway_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-   -
-   - Copyright 1997-2008 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ja.html
index dc78d46..949c7b0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hello_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-helloapp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-helloapp_ja.html
index 9f6bec3..126100a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-helloapp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-helloapp_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hellocmake_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hellocmake_ja.html
index 32eadfd..6565474 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hellocmake_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-hellocmake_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-helloqt_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-helloqt_ja.html
index d6138d6..ce24751 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-helloqt_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-helloqt_ja.html
@@ -1,40 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-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]"
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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.
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-Portions Copyrighted 2009 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-io_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-io_ja.html
index 001ec1d..3bebe64 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-io_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-io_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ja.html
index bc26e06..ea13e10 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-lexyacc_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-mp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-mp_ja.html
index 9abec2e..3e5fded 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-mp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-mp_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html
index ff385d3..b642d8c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
   
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-quote_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-quote_ja.html
index 3c7ca55..afb62ff 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-quote_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-quote_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-welcome_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-welcome_ja.html
index 7dcb5f8..faf9209 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-welcome_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-welcome_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-cFiles_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-cFiles_ja.html
index d8208de..234a3ef 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-cFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-cFiles_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-class_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-class_ja.html
index ce6a2fb..77e00f1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-class_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-class_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-cppFiles_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-cppFiles_ja.html
index f3d140f..c8b6ee7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-cppFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-cppFiles_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-c_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-c_ja.html
index 1356ad7..726e166 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-c_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-cc_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-cc_ja.html
index d90ad1c..83a5ae6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-cc_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-cc_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-f90_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-f90_ja.html
index 18cfd63..3899b4c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-f90_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-empty-f90_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-file_header_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-file_header_ja.html
index add6bc7..14ca65d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-file_header_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-file_header_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-file_plus_header_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-file_plus_header_ja.html
index 7a4c98f..4e8eab2 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-file_plus_header_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-file_plus_header_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-fixed-fortran-f_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-fixed-fortran-f_ja.html
index a085b37..d65b117 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-fixed-fortran-f_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-fixed-fortran-f_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-fortranFiles_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-fortranFiles_ja.html
index 42e4be1..ba98c73 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-fortranFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-fortranFiles_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-free-fortran-f90_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-free-fortran-f90_ja.html
index 361f781..9eabf91 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-free-fortran-f90_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-free-fortran-f90_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-module-f90_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-module-f90_ja.html
index dd4036f..2663a25 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-module-f90_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-module-f90_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtfiles_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtfiles_ja.html
index 791db62..a009fd0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtfiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtfiles_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtform_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtform_ja.html
index 5a11c09..4daa8af 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtform_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtform_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtresource_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtresource_ja.html
index 4b95e7c..4806b5b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtresource_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qtresource_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qttranslation_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qttranslation_ja.html
index 7bd5382..aab2c84 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qttranslation_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-qttranslation_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-c-h_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-c-h_ja.html
index d8af530..682a212 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-c-h_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-c-h_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-c_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-c_ja.html
index 6ae7e46..74b873c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-c_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-h_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-h_ja.html
index 933b6b2..b6d90fd 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-h_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-h_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-qt_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-qt_ja.html
index 64a008a..e68c608 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-qt_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-qt_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-standard-header_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-standard-header_ja.html
index 0b9aa64..794b110 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-standard-header_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc-standard-header_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc_ja.html
index ffdcd35..9e07ffb 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-resources-simple-cc_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-bashScript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-bashScript_ja.html
index 44ce6dc..2611d9c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-bashScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-bashScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-complexMakefile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-complexMakefile_ja.html
index 5c81799..1ab3a8e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-complexMakefile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-complexMakefile_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-cshScript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-cshScript_ja.html
index 1c06db3..fd3da70 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-cshScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-cshScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-kshScript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-kshScript_ja.html
index 74ad42a..0e2e2fc 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-kshScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-kshScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-makefiles_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-makefiles_ja.html
index 74bad4d..6b108cc 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-makefiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-makefiles_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-scriptTemplates_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-scriptTemplates_ja.html
index f073258..69f1d84 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-scriptTemplates_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-scriptTemplates_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-shScript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-shScript_ja.html
index dc077fb..d192207 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-shScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-shScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-zshScript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-zshScript_ja.html
index 0b124b2..3c20087 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-zshScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-script-resources-zshScript_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-simple-test-c_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-simple-test-c_ja.html
index c5d59b5..0f9b291 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-simple-test-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-simple-test-c_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-simple-test-cc_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-simple-test-cc_ja.html
index 0b2b060..cd03cc4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-simple-test-cc_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-simple-test-cc_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-test-simple-c_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-test-simple-c_ja.html
index 96a40dd..54a372f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-test-simple-c_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-test-simple-c_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-test-simple-cpp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-test-simple-cpp_ja.html
index ca0320e..0fb6cb7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-test-simple-cpp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-test-simple-cpp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-testFiles_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-testFiles_ja.html
index 91f75f0..96e7378 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-testFiles_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-simpleunit-resources-testFiles_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_ja.properties
index a1f2eb6..bf57da6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_Options=\u9001\u4fe1\u5148
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_ja.properties
index 1c0b65b..9cff3db 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-apisupport-restsample-RESTSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-apisupport-restsample-RESTSampleDescription_ja.html
index 31e4a61..b873007 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-apisupport-restsample-RESTSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-apisupport-restsample-RESTSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-css-resources-CSS_template_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-css-resources-CSS_template_ja.html
index e3be138..a0f93ab 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-css-resources-CSS_template_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-css-resources-CSS_template_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-glassfish-javaee-templates-weblogicDD_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-glassfish-javaee-templates-weblogicDD_ja.html
index 9b71afd..0f89790 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-glassfish-javaee-templates-weblogicDD_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-glassfish-javaee-templates-weblogicDD_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-html-TemplateHelp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-html-TemplateHelp_ja.html
index 62a63ed..3321bb8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-html-TemplateHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-html-TemplateHelp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-html-XhtmlTemplateHelp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-html-XhtmlTemplateHelp_ja.html
index b769d51..e9f36a5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-html-XhtmlTemplateHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-html-XhtmlTemplateHelp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-clientproject-ui-resources-application-client-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-clientproject-ui-resources-application-client-emptyProject_ja.html
index 739c313..3f36b2a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-clientproject-ui-resources-application-client-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-clientproject-ui-resources-application-client-emptyProject_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-clientproject-ui-resources-application-client-importProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-clientproject-ui-resources-application-client-importProject_ja.html
index b56c3de..319a8dd 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-clientproject-ui-resources-application-client-importProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-clientproject-ui-resources-application-client-importProject_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-emptyProject_ja.html
index e660b63..c302b62 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-emptyProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-importProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-importProject_ja.html
index 74a64e3..efc09f5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-importProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear-importProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear_ja.html
index 71ef91e..f9ed720 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-earproject-ui-resources-ear_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-ejb-wizard-dd-ejbJarXml_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-ejb-wizard-dd-ejbJarXml_ja.html
index 1d84cef..1189268 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-ejb-wizard-dd-ejbJarXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-ejb-wizard-dd-ejbJarXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-ejb-wizard-jpa-dao-ejbFacade_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-ejb-wizard-jpa-dao-ejbFacade_ja.html
index 2bc1141..d934548 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-ejb-wizard-jpa-dao-ejbFacade_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-ejb-wizard-jpa-dao-ejbFacade_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-CachingServiceLocator_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-CachingServiceLocator_ja.html
index e8c0a76..481966a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-CachingServiceLocator_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-CachingServiceLocator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-EntityEJB_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-EntityEJB_ja.html
index 953c41a..00bfdea 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-EntityEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-EntityEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-MessageEJB_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-MessageEJB_ja.html
index 4bafd66..b52eace 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-MessageEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-MessageEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-ServiceLocator_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-ServiceLocator_ja.html
index 4f71958..23e1b9d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-ServiceLocator_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-ServiceLocator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-SessionEJB_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-SessionEJB_ja.html
index 9f57afe..aee5924 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-SessionEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-SessionEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-TimerSessionEJB_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-TimerSessionEJB_ja.html
index 0680799..0862ba9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-TimerSessionEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbcore-resources-TimerSessionEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbjarproject-ui-resources-ejb-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbjarproject-ui-resources-ejb-emptyProject_ja.html
index d1d49bc..b9de509 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbjarproject-ui-resources-ejb-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbjarproject-ui-resources-ejb-emptyProject_ja.html
@@ -1,41 +1,21 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
-
-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.
-
-Contributor(s):
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
 -->
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbjarproject-ui-resources-ejb-importProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbjarproject-ui-resources-ejb-importProject_ja.html
index 624f866..c859c38 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbjarproject-ui-resources-ejb-importProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-ejbjarproject-ui-resources-ejb-importProject_ja.html
@@ -1,41 +1,21 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
-
-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.
-
-Contributor(s):
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
 -->
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-AnnotationOverrideInterceptor_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-AnnotationOverrideInterceptor_ja.html
index f107dc3..445867e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-AnnotationOverrideInterceptor_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-AnnotationOverrideInterceptor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ApplicationScopedResources_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ApplicationScopedResources_ja.html
index d814aa7..c59c6ac 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ApplicationScopedResources_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ApplicationScopedResources_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-AsyncRequest_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-AsyncRequest_ja.html
index 41c42ea..cf297bc 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-AsyncRequest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-AsyncRequest_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-EjbContainer_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-EjbContainer_ja.html
index 33ec579..1d28d93 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-EjbContainer_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-EjbContainer_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-EmbeddedGlassfish_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-EmbeddedGlassfish_ja.html
index e3df308..c393d8c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-EmbeddedGlassfish_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-EmbeddedGlassfish_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-InterceptorStateless_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-InterceptorStateless_ja.html
index a98e1bd..88e093f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-InterceptorStateless_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-InterceptorStateless_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-JsfJpaCrud_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-JsfJpaCrud_ja.html
index 532f96d..d4d70a9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-JsfJpaCrud_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-JsfJpaCrud_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-JsfJpa_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-JsfJpa_ja.html
index 6b68492..72cb09c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-JsfJpa_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-JsfJpa_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-LotteryAnnotation_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-LotteryAnnotation_ja.html
index 671d998..ee8e083 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-LotteryAnnotation_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-LotteryAnnotation_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-PetCatalog_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-PetCatalog_ja.html
index 5f7d32a..34e07af 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-PetCatalog_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-PetCatalog_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ScrumToys_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ScrumToys_ja.html
index 6d540b2..0a49d4e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ScrumToys_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ScrumToys_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ServletStateless_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ServletStateless_ja.html
index 79a236e..62bd8b0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ServletStateless_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-ServletStateless_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-WebJpa_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-WebJpa_ja.html
index 463d0ac..026fc80 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-WebJpa_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-samples-descriptions-WebJpa_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-ConnectionPoolWizardInfo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-ConnectionPoolWizardInfo_ja.html
index f23cf64..3165dc1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-ConnectionPoolWizardInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-ConnectionPoolWizardInfo_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-DataSourceWizardInfo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-DataSourceWizardInfo_ja.html
index 07c8c69..dd0ca77 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-DataSourceWizardInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-DataSourceWizardInfo_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-JavaMailWizardInfo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-JavaMailWizardInfo_ja.html
index 7af7b74..b1a821c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-JavaMailWizardInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-JavaMailWizardInfo_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-JavaMessageWizardInfo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-JavaMessageWizardInfo_ja.html
index 2b1a1b7..35f7fe3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-JavaMessageWizardInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-JavaMessageWizardInfo_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-WizardInformation_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-WizardInformation_ja.html
index 69c06c1..1bf8f30 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-WizardInformation_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-ide-sunresources-wizards-WizardInformation_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-share-configbean-templates-sunDD_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-share-configbean-templates-sunDD_ja.html
index 8fa20b7..bebfc45 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-share-configbean-templates-sunDD_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-j2ee-sun-share-configbean-templates-sunDD_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-Constraint_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-Constraint_ja.html
index 1d5e302..cc749a8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-Constraint_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-Constraint_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-ValidationConfiguration_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-ValidationConfiguration_ja.html
index f4fcfbd..bc282c1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-ValidationConfiguration_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-ValidationConfiguration_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-ValidationMapping_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-ValidationMapping_ja.html
index 9948121..8a7c8c1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-ValidationMapping_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-ValidationMapping_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-WebInfo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-WebInfo_ja.html
index ba66687..5c87586 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-WebInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-beanvalidation-resources-WebInfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-project-dd-ear-applicationXml_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-project-dd-ear-applicationXml_ja.html
index 2e9a40c..3f7afbe 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-project-dd-ear-applicationXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javaee-project-dd-ear-applicationXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javascript2-editor-resources-javascript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javascript2-editor-resources-javascript_ja.html
index 5b1bb0f..ca238c4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javascript2-editor-resources-javascript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-javascript2-editor-resources-javascript_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-AppClientDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-AppClientDescription_ja.html
index b4e67fe..be52b48 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-AppClientDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-AppClientDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-EADescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-EADescription_ja.html
index cd0862e..7ede951 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-EADescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-EADescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-EjbDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-EjbDescription_ja.html
index 57529b1..a8e668c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-EjbDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-EjbDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-WebAppDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-WebAppDescription_ja.html
index df8c96c..7766406 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-WebAppDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-j2ee-ui-wizard-resources-WebAppDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AbsoluteOrdering_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AbsoluteOrdering_ja.html
index fbdd900..4f60239 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AbsoluteOrdering_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AbsoluteOrdering_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AnnotationWar_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AnnotationWar_ja.html
index 73d8e7b..7c413fb 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AnnotationWar_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AnnotationWar_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AsyncChat_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AsyncChat_ja.html
index 17eccae..47e3b3e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AsyncChat_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AsyncChat_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Auction_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Auction_ja.html
index 56c27d4..a196dd3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Auction_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Auction_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AutomaticTimer_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AutomaticTimer_ja.html
index 2275be5..448c5a8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AutomaticTimer_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-AutomaticTimer_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-BeanValidation_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-BeanValidation_ja.html
index 33cc311..ad2a8e9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-BeanValidation_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-BeanValidation_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-CDIGuess_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-CDIGuess_ja.html
index f9e35b5..d55a5af 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-CDIGuess_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-CDIGuess_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-CDIServlet_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-CDIServlet_ja.html
index dff0cd3..4ade3c9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-CDIServlet_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-CDIServlet_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Contracts_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Contracts_ja.html
index 9d4d41f..6945861 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Contracts_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Contracts_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Draw_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Draw_ja.html
index fc12282..16f1c4e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Draw_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Draw_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-DynamicRegistration_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-DynamicRegistration_ja.html
index 8983263..f8e1f04 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-DynamicRegistration_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-DynamicRegistration_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-EL_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-EL_ja.html
index 33b7be8..efa2261 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-EL_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-EL_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Echo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Echo_ja.html
index 2f10d8a..c54ff62 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Echo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Echo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-EjbEmbedded_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-EjbEmbedded_ja.html
index d6a8d3d..82fc06a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-EjbEmbedded_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-EjbEmbedded_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Events_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Events_ja.html
index 5a976b2..2126816 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Events_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Events_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Executor_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Executor_ja.html
index 8d8918f..2af0f67 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Executor_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Executor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-FileUpload_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-FileUpload_ja.html
index 83d953c..f88dfb1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-FileUpload_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-FileUpload_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HTML5_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HTML5_ja.html
index 76ea380..eb4ed85 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HTML5_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HTML5_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HelloStatelessEjb_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HelloStatelessEjb_ja.html
index e0c34c8..c2e3f76 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HelloStatelessEjb_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HelloStatelessEjb_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HelloStatelessWar_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HelloStatelessWar_ja.html
index 814f6ec..2711643 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HelloStatelessWar_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HelloStatelessWar_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HttpUpgrade_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HttpUpgrade_ja.html
index 4efeef9..e718dfe 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HttpUpgrade_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-HttpUpgrade_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Interceptors_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Interceptors_ja.html
index dee4483..61e5894 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Interceptors_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Interceptors_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-JoboperatorAPI_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-JoboperatorAPI_ja.html
index 1f98804..754850e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-JoboperatorAPI_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-JoboperatorAPI_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Maven2CalculatorClient_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Maven2CalculatorClient_ja.html
index 82a2f5b..474d868 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Maven2CalculatorClient_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Maven2CalculatorClient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Maven2Calculator_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Maven2Calculator_ja.html
index e502264..a3a3803 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Maven2Calculator_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Maven2Calculator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MavenCRUDSample_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MavenCRUDSample_ja.html
index bc4f73b..01564b6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MavenCRUDSample_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MavenCRUDSample_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MavenScrumToys_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MavenScrumToys_ja.html
index cd26d4f..5fb12c3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MavenScrumToys_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MavenScrumToys_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MessageBoard_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MessageBoard_ja.html
index a30a5d1..8997305 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MessageBoard_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-MessageBoard_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Multipart_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Multipart_ja.html
index bfa1ba2..b3091de 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Multipart_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Multipart_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-NonBlockingRead_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-NonBlockingRead_ja.html
index 46e6a63..65f3aee 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-NonBlockingRead_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-NonBlockingRead_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-NonBlockingWrite_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-NonBlockingWrite_ja.html
index ae46606..26238f8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-NonBlockingWrite_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-NonBlockingWrite_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Payroll_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Payroll_ja.html
index c77d307..02990e6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Payroll_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Payroll_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Schedule_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Schedule_ja.html
index 49304d3..16af33c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Schedule_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Schedule_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-SessionCookie_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-SessionCookie_ja.html
index e677581..7b34d41 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-SessionCookie_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-SessionCookie_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Threads_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Threads_ja.html
index 176be3d..13f8d76 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Threads_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Threads_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-TransactionScoped_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-TransactionScoped_ja.html
index 6ed871f..b880f48 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-TransactionScoped_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-TransactionScoped_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Transactional_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Transactional_ja.html
index fd17af3..a27cf84 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Transactional_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-maven-samples-descriptions-Transactional_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-spring-webmvc-resources-abstractController_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-spring-webmvc-resources-abstractController_ja.html
index 31b0470..b0456b8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-spring-webmvc-resources-abstractController_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-spring-webmvc-resources-abstractController_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-spring-webmvc-resources-simpleFormController_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-spring-webmvc-resources-simpleFormController_ja.html
index b9df48b..cba7b23 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-spring-webmvc-resources-simpleFormController_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-spring-webmvc-resources-simpleFormController_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-BeansXml_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-BeansXml_ja.html
index 6f8f4ef..6450ee8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-BeansXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-BeansXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Interceptor_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Interceptor_ja.html
index d90eec8..cb125d8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Interceptor_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Interceptor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Qualifier_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Qualifier_ja.html
index 5cddd35..24dad1e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Qualifier_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Qualifier_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Scope_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Scope_ja.html
index 2bc098c..8ee5b68 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Scope_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Scope_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Stereotype_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Stereotype_ja.html
index b56105a..294b525 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Stereotype_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-beans-resources-Stereotype_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-client-rest-wizard-resources-JSClient_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-client-rest-wizard-resources-JSClient_ja.html
index 83744e5..f089632 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-client-rest-wizard-resources-JSClient_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-client-rest-wizard-resources-JSClient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-JSPInfo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-JSPInfo_ja.html
index fa23c17..9c0e0a7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-JSPInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-JSPInfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-ServletListener_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-ServletListener_ja.html
index cc758b6..19eb72d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-ServletListener_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-ServletListener_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-Servlet_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-Servlet_ja.html
index dbf8998..66b8b39 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-Servlet_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-Servlet_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2001, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-SimpleFilter_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-SimpleFilter_ja.html
index 7dfeaa1..ce24c03 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-SimpleFilter_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-SimpleFilter_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagFile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagFile_ja.html
index 5cd283e..b8a0cb3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagHandler_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagHandler_ja.html
index 7bc9bfe..150f170 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagHandler_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagHandler_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagLibrary_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagLibrary_ja.html
index a01a2bd..ae89cc8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-TagLibrary_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-WebInfo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-WebInfo_ja.html
index 18153b7..18d2a8c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-WebInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-WebInfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-webFragmentXml_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-webFragmentXml_ja.html
index 5ffbb52..5c212cf 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-webFragmentXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-webFragmentXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-webXml_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-webXml_ja.html
index 1f1d4ea..d1fa0a3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-webXml_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-core-resources-webXml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-freeform-resources-freeform-project-web_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-freeform-resources-freeform-project-web_ja.html
index 9a6d24f..7b8c538 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-freeform-resources-freeform-project-web_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-freeform-resources-freeform-project-web_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-facelets-resources-TemplateClient_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-facelets-resources-TemplateClient_ja.html
index ae96799..27cd76a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-facelets-resources-TemplateClient_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-facelets-resources-TemplateClient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <HTML>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-facelets-resources-Template_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-facelets-resources-Template_ja.html
index 75280db..3bdb50f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-facelets-resources-Template_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-facelets-resources-Template_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <HTML>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-FacesComponent_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-FacesComponent_ja.html
index d54887d..9885e9d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-FacesComponent_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-FacesComponent_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-FacesConfig_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-FacesConfig_ja.html
index ba9d370..935b097 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-FacesConfig_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-FacesConfig_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JSFInfo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JSFInfo_ja.html
index b26bd71..619b463 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JSFInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JSFInfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JSFManagedBean_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JSFManagedBean_ja.html
index c17521b..ab4eaf9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JSFManagedBean_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JSFManagedBean_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JsfFromDB_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JsfFromDB_ja.html
index cf6d2aa..4a40bfe 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JsfFromDB_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-JsfFromDB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-ResourceLibraryContract_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-ResourceLibraryContract_ja.html
index 2b96593..2a5515c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-ResourceLibraryContract_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-ResourceLibraryContract_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-compositeComponent_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-compositeComponent_ja.html
index e10122e..a969b66 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-compositeComponent_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-jsf-resources-compositeComponent_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web-emptyProject_ja.html
index 4400ec1..d576d5b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web-emptyProject_ja.html
@@ -1,41 +1,21 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
-
-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.
-
-Contributor(s):
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
 -->
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web-importProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web-importProject_ja.html
index 7947cda..28664b3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web-importProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web-importProject_ja.html
@@ -1,41 +1,21 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
-
-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.
-
-Contributor(s):
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
 -->
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web_ja.html
index aed1278..10a7d73 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-project-ui-resources-web_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-struts-resources-StrutsAction_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-struts-resources-StrutsAction_ja.html
index 5fbb482..031bc0e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-struts-resources-StrutsAction_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-struts-resources-StrutsAction_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-struts-resources-StrutsFormBean_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-struts-resources-StrutsFormBean_ja.html
index 74a8722..35de702 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-struts-resources-StrutsFormBean_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-web-struts-resources-StrutsFormBean_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websocket-wizard-resources-WebSocket_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websocket-wizard-resources-WebSocket_ja.html
index b2824cc..ad8c481 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websocket-wizard-resources-WebSocket_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websocket-wizard-resources-WebSocket_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-client-resources-WebServiceClient_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-client-resources-WebServiceClient_ja.html
index f9393b1..4705049 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-client-resources-WebServiceClient_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-client-resources-WebServiceClient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-LogicalHandler_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-LogicalHandler_ja.html
index 7019ab5..5e70459 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-LogicalHandler_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-LogicalHandler_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-MessageHandler_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-MessageHandler_ja.html
index aa6a8ce..1129c5f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-MessageHandler_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-MessageHandler_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-WebServiceFromWSDL_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-WebServiceFromWSDL_ja.html
index cdacbb5..f31be90 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-WebServiceFromWSDL_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-WebServiceFromWSDL_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-WebService_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-WebService_ja.html
index 22639d9..b38f61f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-WebService_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-core-dev-resources-WebService_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-metro-samples-descriptions-Calculator_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-metro-samples-descriptions-Calculator_ja.html
index ebe85f2..5f3c988 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-metro-samples-descriptions-Calculator_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-metro-samples-descriptions-Calculator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.1 Transitional//EN">
 <html><head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-metro-samples-descriptions-SecureCalculator_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-metro-samples-descriptions-SecureCalculator_ja.html
index 67f5adc..eb98f02 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-metro-samples-descriptions-SecureCalculator_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-metro-samples-descriptions-SecureCalculator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.1 Transitional//EN">
 <html><head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-CustomerDBSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-CustomerDBSampleDescription_ja.html
index 55293f5..9e4b136 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-CustomerDBSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-CustomerDBSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-HelloWorldSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-HelloWorldSampleDescription_ja.html
index 28b4a44..c88ac20 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-HelloWorldSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-HelloWorldSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-LeanServiceECBComponentWithAjax_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-LeanServiceECBComponentWithAjax_ja.html
index 2431b19..07b1e97 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-LeanServiceECBComponentWithAjax_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-LeanServiceECBComponentWithAjax_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-MessageBoardSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-MessageBoardSampleDescription_ja.html
index 57018be..548558a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-MessageBoardSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-MessageBoardSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-RestRCPMvnAppSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-RestRCPMvnAppSampleDescription_ja.html
index 88fb1ea..5a8837c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-RestRCPMvnAppSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-samples-resources-RestRCPMvnAppSampleDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-DatabaseResource_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-DatabaseResource_ja.html
index 5bc9075..e479e69 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-DatabaseResource_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-DatabaseResource_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-EntityResources_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-EntityResources_ja.html
index 7ce21f5..cc94469 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-EntityResources_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-EntityResources_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JaxRsFilter_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JaxRsFilter_ja.html
index 3d0cf1a..05883ff 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JaxRsFilter_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JaxRsFilter_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JaxRsInterceptor_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JaxRsInterceptor_ja.html
index d9172a6..76d01be 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JaxRsInterceptor_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JaxRsInterceptor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JerseyClientWizard_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JerseyClientWizard_ja.html
index 693a6a7..1507c0b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JerseyClientWizard_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-JerseyClientWizard_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-OriginResourceFilter_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-OriginResourceFilter_ja.html
index ee998ac..a2353b5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-OriginResourceFilter_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-OriginResourceFilter_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-PatternResources_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-PatternResources_ja.html
index d0d6130..7357e3b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-PatternResources_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-rest-wizard-resources-PatternResources_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-wsitconf-resources-STSWizard_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-wsitconf-resources-STSWizard_ja.html
index 0127cee..e908468 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-wsitconf-resources-STSWizard_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/org-netbeans-modules-websvc-wsitconf-resources-STSWizard_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/Bundle_ja.properties
index 72907a3..d53afff 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 Ant=Ant
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/org-apache-tools-ant-module-resources-CustomTaskDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/org-apache-tools-ant-module-resources-CustomTaskDescription_ja.html
index bd749ac..b22f392 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/org-apache-tools-ant-module-resources-CustomTaskDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/org-apache-tools-ant-module-resources-CustomTaskDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2001, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/org-apache-tools-ant-module-resources-ProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/org-apache-tools-ant-module-resources-ProjectDescription_ja.html
index 171fc1e..7cf5e68 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/org-apache-tools-ant-module-resources-ProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/extide/org-apache-tools-ant-module-resources-ProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2001, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/fod/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/fod/Bundle_ja.properties
index daa97a3..2acb0d8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/fod/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/fod/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_OpenAdvancedAction=\u8a73\u7d30\u3092\u958b\u304f...
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/Bundle_ja.properties
index 038bcce..459602f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-Controller_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-Controller_ja.html
index 1dc2f94..e7c402e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-Controller_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-Controller_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-DomainClass_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-DomainClass_ja.html
index 4873d4e..348046c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-DomainClass_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-DomainClass_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-GantScript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-GantScript_ja.html
index 139ebf1..64b5625 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-GantScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-GantScript_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-IntegrationTest_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-IntegrationTest_ja.html
index 0c4e5c5..d5fe74e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-IntegrationTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-IntegrationTest_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-Service_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-Service_ja.html
index b91f12a..3cc272f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-Service_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-Service_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-TagLib_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-TagLib_ja.html
index 82536e0..eedf8e4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-TagLib_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-TagLib_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-UnitTest_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-UnitTest_ja.html
index 396f1b7..5c3722c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-UnitTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-UnitTest_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-desktop_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-desktop_ja.html
index 36e2826..d2541d4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-desktop_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-emptyProject_ja.html
index ce5a798..86cb41a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-grailsproject-resources-emptyProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-gsp-resources-GspTemplate_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-gsp-resources-GspTemplate_ja.html
index 2d7835b..a38bed9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-gsp-resources-GspTemplate_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-gsp-resources-GspTemplate_ja.html
@@ -5,43 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-samples-gjdemo-GroovyJavaDemoDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-samples-gjdemo-GroovyJavaDemoDescription_ja.html
index 0d01c02..c13e61c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-samples-gjdemo-GroovyJavaDemoDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-samples-gjdemo-GroovyJavaDemoDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-samples-nbprojectgen-NBProjectGeneratorsDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-samples-nbprojectgen-NBProjectGeneratorsDescription_ja.html
index 36f621d..de88b94 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-samples-nbprojectgen-NBProjectGeneratorsDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-samples-nbprojectgen-NBProjectGeneratorsDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyClass_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyClass_ja.html
index 61c0f08..678ecac 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyClass_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyClass_ja.html
@@ -5,43 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyJUnitTest_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyJUnitTest_ja.html
index c12fcb7..75b2fe2 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyJUnitTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyJUnitTest_ja.html
@@ -3,43 +3,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyScript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyScript_ja.html
index fdcae42..9ef7819 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/groovy/org-netbeans-modules-groovy-support-resources-GroovyScript_ja.html
@@ -5,43 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_ja.properties
index 4709fcc..9eaf285 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 projectImporter=Eclipse
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-BeanInfo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-BeanInfo_ja.html
index 27f06d4..93b38f0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-BeanInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-BeanInfo_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Bean_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Bean_ja.html
index 5bb7c44..2f01d7d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Bean_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Bean_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Beans_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Beans_ja.html
index 85833a2..b62aec9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Beans_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Beans_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Customizer_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Customizer_ja.html
index 1dd1d92..4ab579a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Customizer_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-Customizer_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-PropertyEditor_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-PropertyEditor_ja.html
index f0c3087..e06f286 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-PropertyEditor_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-beans-resources-templates-PropertyEditor_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-dbschema-jdbcimpl-resources-DBSchema_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-dbschema-jdbcimpl-resources-DBSchema_ja.html
index 1ab78d4..73a57c1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-dbschema-jdbcimpl-resources-DBSchema_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-dbschema-jdbcimpl-resources-DBSchema_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-dbschema-jdbcimpl-resources-Databases_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-dbschema-jdbcimpl-resources-Databases_ja.html
index 96f7c8d..341aaba 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-dbschema-jdbcimpl-resources-Databases_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-dbschema-jdbcimpl-resources-Databases_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-j2ee-resources-MasterDetail_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-j2ee-resources-MasterDetail_ja.html
index ad261e1..251f77c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-j2ee-resources-MasterDetail_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-j2ee-resources-MasterDetail_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-AWTForms_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-AWTForms_ja.html
index 89b0a7a..891a816 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-AWTForms_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-AWTForms_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Application_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Application_ja.html
index c4f9e39..d72c9c0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Application_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Application_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-BeanForm_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-BeanForm_ja.html
index 5b66e82..a13cdd0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-BeanForm_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-BeanForm_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2001, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Dialog_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Dialog_ja.html
index bdbb47b..f41d4c0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Dialog_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Dialog_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Dialogs_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Dialogs_ja.html
index e305b15..66d701b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Dialogs_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Dialogs_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-FormApplet_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-FormApplet_ja.html
index 9391752..ded515b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-FormApplet_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-FormApplet_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-FormJApplet_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-FormJApplet_ja.html
index ed803c7..7166e53 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-FormJApplet_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-FormJApplet_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Forms_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Forms_ja.html
index c7d906c..28b0817 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Forms_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Forms_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Frame_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Frame_ja.html
index 6fa12a0..56109b1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Frame_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Frame_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JDialog_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JDialog_ja.html
index 04a7a89..64ea212 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JDialog_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JDialog_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JFrame_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JFrame_ja.html
index 74cc432..0042f97 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JFrame_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JFrame_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JInternalFrame_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JInternalFrame_ja.html
index fd96b25..725d1f5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JInternalFrame_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JInternalFrame_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JPanel_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JPanel_ja.html
index 56e51d1..21eb292 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JPanel_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-JPanel_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-MDIApplication_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-MDIApplication_ja.html
index e1836fd..41a8d1f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-MDIApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-MDIApplication_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-OKCancelDialog_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-OKCancelDialog_ja.html
index 853a3b3..55e2479 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-OKCancelDialog_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-OKCancelDialog_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Panel_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Panel_ja.html
index 18b7631..4063d6b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Panel_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-form-resources-Panel_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateCodeGenFile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateCodeGenFile_ja.html
index 71a9785..8f2084b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateCodeGenFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateCodeGenFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateConfigurationFile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateConfigurationFile_ja.html
index 6c35d9e..a12db1f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateConfigurationFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateConfigurationFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateMappingFile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateMappingFile_ja.html
index ad97400..2891f9b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateMappingFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateMappingFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateRevengFile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateRevengFile_ja.html
index bac3e58..91f4017 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateRevengFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateRevengFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateUtilFile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateUtilFile_ja.html
index 50f9342..68573c1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateUtilFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-hibernate-resources-HibernateUtilFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-DBScript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-DBScript_ja.html
index f5bf8e1..83a6006 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-DBScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-DBScript_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-EntityDatabase_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-EntityDatabase_ja.html
index d6613a0..5bd66f8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-EntityDatabase_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-EntityDatabase_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-EntityEJB_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-EntityEJB_ja.html
index 8a50c7b..5b992dd 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-EntityEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-EntityEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-JpaController_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-JpaController_ja.html
index fb947d3..676b93f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-JpaController_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-JpaController_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-PersistenceUnit_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-PersistenceUnit_ja.html
index cd66b9d..04e7e3c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-PersistenceUnit_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-j2ee-persistence-ui-resources-PersistenceUnit_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-ClientEditor_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-ClientEditor_ja.html
index 9b8c1d3..251121b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-ClientEditor_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-ClientEditor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-GUIFormExamples_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-GUIFormExamples_ja.html
index 5189ae3..5e40470 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-GUIFormExamples_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-GUIFormExamples_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-anagrams_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-anagrams_ja.html
index 59a4228..6bf11b4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-anagrams_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-anagrams_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.1 Transitional//EN">
 <html><head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-j2seSamplesCategory_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-j2seSamplesCategory_ja.html
index 481b940..41e7262 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-j2seSamplesCategory_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-examples-resources-descriptions-j2seSamplesCategory_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-freeform-resources-freeform-project-java_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-freeform-resources-freeform-project-java_ja.html
index 252b8e8..1624fc3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-freeform-resources-freeform-project-java_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-freeform-resources-freeform-project-java_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-desktop_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-desktop_ja.html
index 93e0140..358af7e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-desktop_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-emptyLibrary_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-emptyLibrary_ja.html
index 4b3243e..3eaab48 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-emptyLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-emptyLibrary_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-emptyProject_ja.html
index 8bc6a4c..2928b0d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-emptyProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-existingProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-existingProject_ja.html
index 77e7485..574d188 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-existingProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-j2seproject-ui-resources-existingProject_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-platform-resources-templates-javaplatform_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-platform-resources-templates-javaplatform_ja.html
index ceb8afc..cf3d48d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-platform-resources-templates-javaplatform_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-platform-resources-templates-javaplatform_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-platform-resources-templates-javaplatformdefinition_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-platform-resources-templates-javaplatformdefinition_ja.html
index 3ad859a..ad0e434 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-platform-resources-templates-javaplatformdefinition_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-platform-resources-templates-javaplatformdefinition_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-AnnotationType_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-AnnotationType_ja.html
index e705051..e89dbd7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-AnnotationType_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-AnnotationType_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Applet_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Applet_ja.html
index 4860cb5..0459be3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Applet_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Applet_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Class_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Class_ja.html
index d7bf6d2..039894b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Class_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Class_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Classes_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Classes_ja.html
index c8732f2..400cf05 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Classes_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Classes_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Empty_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Empty_ja.html
index 151ecb1..7dd08ea 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Empty_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Empty_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Enum_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Enum_ja.html
index 50a6610..944f0c8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Enum_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Enum_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Exception_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Exception_ja.html
index 3736d68..7886182 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Exception_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Exception_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Interface_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Interface_ja.html
index 524af85..5acaa13 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Interface_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Interface_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-JApplet_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-JApplet_ja.html
index cf2a076..a5eaabd 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-JApplet_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-JApplet_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Main_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Main_ja.html
index 9c99834..309ee2f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Main_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Main_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Package_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Package_ja.html
index c0bb85b..ce74a53 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Package_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Package_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Singleton_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Singleton_ja.html
index 5b3965b..3d4d770 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Singleton_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-Singleton_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-package-info_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-package-info_ja.html
index 0fe663a..dbe3631 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-package-info_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-java-project-ui-resources-package-info_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-javawebstart-resources-JNLPTemplate_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-javawebstart-resources-JNLPTemplate_ja.html
index d2894c0..7afb0c9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-javawebstart-resources-JNLPTemplate_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-javawebstart-resources-JNLPTemplate_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-EmptyJUnitTest_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-EmptyJUnitTest_ja.html
index 88dc1d6..ee7ae88 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-EmptyJUnitTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-EmptyJUnitTest_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-SimpleJUnitTest_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-SimpleJUnitTest_ja.html
index fae7d46..31022a0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-SimpleJUnitTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-SimpleJUnitTest_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-TestSuite_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-TestSuite_ja.html
index 0602b23..bd569ee 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-TestSuite_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-junit-ui-resources-TestSuite_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-ExistingDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-ExistingDescription_ja.html
index 6b7f6f6..f814ad6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-ExistingDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-ExistingDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-MavenDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-MavenDescription_ja.html
index 9141224..e129f80 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-MavenDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-MavenDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-idenative-pom-root_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-idenative-pom-root_ja.html
index 1aeeeaa..fea2754 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-idenative-pom-root_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-idenative-pom-root_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-idenative-quickstart_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-idenative-quickstart_ja.html
index 5858b31..a0118dc 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-idenative-quickstart_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-idenative-quickstart_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-javafx_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-javafx_ja.html
index 00a1ad5..a259951 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-javafx_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-newproject-javafx_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-osgi-templates-OSGiDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-osgi-templates-OSGiDescription_ja.html
index 2fbaead..1ac44e0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-osgi-templates-OSGiDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-osgi-templates-OSGiDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-osgi-templates-new_OSGi_activator_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-osgi-templates-new_OSGi_activator_ja.html
index 185242e..9a3d6fb 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-osgi-templates-new_OSGi_activator_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-maven-osgi-templates-new_OSGi_activator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-selenium2-java-SeleneseITJava_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-selenium2-java-SeleneseITJava_ja.html
index cfb2362..8d4e98d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-selenium2-java-SeleneseITJava_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-selenium2-java-SeleneseITJava_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-spring-beans-resources-newSpringXMLConfig_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-spring-beans-resources-newSpringXMLConfig_ja.html
index 0cad531..e2d86da 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-spring-beans-resources-newSpringXMLConfig_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-spring-beans-resources-newSpringXMLConfig_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-testng-ui-resources-newTestSuite_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-testng-ui-resources-newTestSuite_ja.html
index b49d0b9..a7ba6b0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-testng-ui-resources-newTestSuite_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-testng-ui-resources-newTestSuite_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-testng-ui-resources-newTest_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-testng-ui-resources-newTest_ja.html
index de0a785..7a64ce2 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-testng-ui-resources-newTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-testng-ui-resources-newTest_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright © 1997-2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 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>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-xml-jaxb-resources-JAXBWiz_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-xml-jaxb-resources-JAXBWiz_ja.html
index df39b40..8a42d8b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-xml-jaxb-resources-JAXBWiz_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/java/org-netbeans-modules-xml-jaxb-resources-JAXBWiz_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/Bundle_ja.properties
index d7b611c..d9d76da 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 Templates/Other/ApduTemplate.scr=\u7a7a\u306eApdu\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-CapProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-CapProjectDescription_ja.html
index 5a252ef..52281c9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-CapProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-CapProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-ClsLibProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-ClsLibProjectDescription_ja.html
index 105e63d..93ad690 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-ClsLibProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-ClsLibProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-EapProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-EapProjectDescription_ja.html
index 64a1612..149a646 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-EapProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-EapProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-ExtLibProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-ExtLibProjectDescription_ja.html
index ecb9c99..113e24a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-ExtLibProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-ExtLibProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-WebProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-WebProjectDescription_ja.html
index da65f9f..b283ab9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-WebProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-resources-WebProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ClassicAppletDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ClassicAppletDescription_ja.html
index f220abf..58b04e7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ClassicAppletDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ClassicAppletDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ExtendedAppletDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ExtendedAppletDescription_ja.html
index e47662d..9dd6523 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ExtendedAppletDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ExtendedAppletDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ServletDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ServletDescription_ja.html
index bc3c991..d922da3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ServletDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javacard/org-netbeans-modules-javacard-templates-ServletDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/Bundle_ja.properties
index 1ed44f8..31f6108 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXML_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXML_ja.html
index a73e257..095a28f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXML_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXML_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXMain_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXMain_ja.html
index 1629807..aeb1853 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXMain_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXMain_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXPreloader_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXPreloader_ja.html
index 0741187..179262d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXPreloader_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXPreloader_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXSwingMain_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXSwingMain_ja.html
index 769c2c9..dc18edc 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXSwingMain_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-FXSwingMain_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXApp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXApp_ja.html
index 1422c89..fe6acc5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXApp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXExistingSources_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXExistingSources_ja.html
index 11cdb03..004bffc 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXExistingSources_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXExistingSources_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXMLApp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXMLApp_ja.html
index 43ec929..6d13d2b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXMLApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXMLApp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXPreloaderApp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXPreloaderApp_ja.html
index d96f9ce..aecc128 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXPreloaderApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXPreloaderApp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXSwingApp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXSwingApp_ja.html
index 605c3e6..1fc2021 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXSwingApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-project-templates-JavaFXSwingApp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-AdvancedMedia_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-AdvancedMedia_ja.html
index 2c6aa63..1f20928 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-AdvancedMedia_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-AdvancedMedia_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-AudioVisualizer3D_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-AudioVisualizer3D_ja.html
index fea9dd3..f774156 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-AudioVisualizer3D_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-AudioVisualizer3D_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-BrickBreaker_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-BrickBreaker_ja.html
index c41320e..7df0dba 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-BrickBreaker_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-BrickBreaker_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChangeListener_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChangeListener_ja.html
index bed49b0..81ed832 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChangeListener_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChangeListener_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedArea_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedArea_ja.html
index f716510..aff820e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedArea_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedArea_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedBar_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedBar_ja.html
index d27933e..fcf86af 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedBar_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedBar_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedPie_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedPie_ja.html
index d270885..afcbfd4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedPie_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedPie_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedScatterLive_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedScatterLive_ja.html
index f9e1126..d65898e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedScatterLive_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedScatterLive_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedScatter_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedScatter_ja.html
index 496b26e..422185d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedScatter_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedScatter_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedStockLine_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedStockLine_ja.html
index f33f248..ef3c4d3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedStockLine_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAdvancedStockLine_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAudioArea_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAudioArea_ja.html
index c267542..3f42336 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAudioArea_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAudioArea_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAudioBar_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAudioBar_ja.html
index e3042b4..a9a9cea 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAudioBar_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartAudioBar_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartLine_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartLine_ja.html
index 5688997..da90aa0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartLine_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ChartLine_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ColorPicker_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ColorPicker_ja.html
index 9cfb8a8..96a4d30 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ColorPicker_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ColorPicker_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ColorfulCircles_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ColorfulCircles_ja.html
index 4bf663c..26233af 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ColorfulCircles_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-ColorfulCircles_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-CreateAdvancedStage_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-CreateAdvancedStage_ja.html
index 13e7438..6ab3a8e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-CreateAdvancedStage_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-CreateAdvancedStage_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Cube3D_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Cube3D_ja.html
index e332601..856251a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Cube3D_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Cube3D_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-CubeSystem3D_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-CubeSystem3D_ja.html
index 2a60a98..0d8b674 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-CubeSystem3D_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-CubeSystem3D_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-DigitalClock_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-DigitalClock_ja.html
index 7a2a151..f1761cb 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-DigitalClock_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-DigitalClock_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-DisplayShelf_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-DisplayShelf_ja.html
index 296a33d..0cb5a95 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-DisplayShelf_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-DisplayShelf_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-FXML-LoginDemo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-FXML-LoginDemo_ja.html
index 3bda0c2..7fd283b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-FXML-LoginDemo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-FXML-LoginDemo_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Fireworks_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Fireworks_ja.html
index 35b5424..4b6352a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Fireworks_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Fireworks_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-HTMLEditorApp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-HTMLEditorApp_ja.html
index 70f03da..c818544 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-HTMLEditorApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-HTMLEditorApp_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-KeyStrokeMotion_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-KeyStrokeMotion_ja.html
index 131da2d..9a67186 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-KeyStrokeMotion_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-KeyStrokeMotion_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-MouseEvents_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-MouseEvents_ja.html
index 8af90a1..84f1673 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-MouseEvents_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-MouseEvents_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-PaginationDemo_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-PaginationDemo_ja.html
index 6fac8ac..8a16819 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-PaginationDemo_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-PaginationDemo_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-PuzzlePieces_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-PuzzlePieces_ja.html
index ed7d7ee..cd7af7c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-PuzzlePieces_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-PuzzlePieces_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-StopWatch_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-StopWatch_ja.html
index ec2f01c..7078a29 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-StopWatch_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-StopWatch_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-SwingInterop_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-SwingInterop_ja.html
index 96d746e..d052ec8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-SwingInterop_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-SwingInterop_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TimelineEvents_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TimelineEvents_ja.html
index 42f12fb..31e78cd 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TimelineEvents_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TimelineEvents_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TimelineInterpolator_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TimelineInterpolator_ja.html
index 716f9ca..4b43519 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TimelineInterpolator_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TimelineInterpolator_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TransitionPath_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TransitionPath_ja.html
index b4387ee..349ee55 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TransitionPath_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TransitionPath_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TransitionRotate_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TransitionRotate_ja.html
index 6844cd8..6f5bcf9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TransitionRotate_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-TransitionRotate_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-WebViewBrowser_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-WebViewBrowser_ja.html
index 1012d0b..6dd6dc3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-WebViewBrowser_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-WebViewBrowser_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Xylophone_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Xylophone_ja.html
index 59a877b..2befc55 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Xylophone_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-Xylophone_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-samples_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-samples_ja.html
index 51f6f6d..533ba94 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-samples_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/javafx/org-netbeans-modules-javafx2-samples-resources-samples_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/Bundle_ja.properties
index 46d279b..8c5aab2 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-templates-MEEPlet_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-templates-MEEPlet_ja.html
index 29cd255..e2dd20b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-templates-MEEPlet_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-templates-MEEPlet_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-templates-samples_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-templates-samples_ja.html
index b141449..540ded7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-templates-samples_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-templates-samples_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-ui-resources-emptyProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-ui-resources-emptyProject_ja.html
index 8f925c1..4b4f802 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-ui-resources-emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-j2me-project-ui-resources-emptyProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-mobility-cldcplatform-resources-templates-j2meplatformdefinition_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-mobility-cldcplatform-resources-templates-j2meplatformdefinition_ja.html
index 42496ed..a3543ad 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-mobility-cldcplatform-resources-templates-j2meplatformdefinition_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/mobility/org-netbeans-modules-mobility-cldcplatform-resources-templates-j2meplatformdefinition_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/newproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/newproject/Bundle_ja.properties
index 7aff763..6ead4b2 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/newproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/newproject/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 DescriptionStep_Name=\u30ea\u30af\u30a8\u30b9\u30c8\u3055\u308c\u3066\u3044\u308b\u6a5f\u80fd\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/Bundle_ja.properties
index 0d85dac..7ea19fa 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-languages-neon-resources-NeonFileDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-languages-neon-resources-NeonFileDescription_ja.html
index 8de7780..332bc47 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-languages-neon-resources-NeonFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-languages-neon-resources-NeonFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-latte-resources-LatteFileDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-latte-resources-LatteFileDescription_ja.html
index 6bd5c9a..f680d0d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-latte-resources-LatteFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-latte-resources-LatteFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phing-ui-resources-BuildXmlDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phing-ui-resources-BuildXmlDescription_ja.html
index cf1a6d0..de110d8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phing-ui-resources-BuildXmlDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phing-ui-resources-BuildXmlDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phpunit-ui-resources-emptyPHPUnitBootstrapDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phpunit-ui-resources-emptyPHPUnitBootstrapDescription_ja.html
index 85603fe..a1d5220 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phpunit-ui-resources-emptyPHPUnitBootstrapDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phpunit-ui-resources-emptyPHPUnitBootstrapDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phpunit-ui-resources-emptyPHPUnitConfigurationDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phpunit-ui-resources-emptyPHPUnitConfigurationDescription_ja.html
index f3176fe..2fcfc8e 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phpunit-ui-resources-emptyPHPUnitConfigurationDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-phpunit-ui-resources-emptyPHPUnitConfigurationDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPClassDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPClassDescription_ja.html
index 35a31ef..df7ac2f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPClassDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPClassDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPFileDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPFileDescription_ja.html
index 0b46bbe..9eed14c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPInterfaceDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPInterfaceDescription_ja.html
index 1dc1fc6..7211668 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPInterfaceDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPInterfaceDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPTraitDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPTraitDescription_ja.html
index f7c409f..43833b3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPTraitDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPTraitDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPWebPageDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPWebPageDescription_ja.html
index 32b2ada..0443d96 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPWebPageDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPHPWebPageDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPhpProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPhpProject_ja.html
index a5d620b..d6c7175 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPhpProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-emptyPhpProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-existingPhpProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-existingPhpProject_ja.html
index 673eaed..f6ce8c7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-existingPhpProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-existingPhpProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-phpDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-phpDescription_ja.html
index 108e899..f2d81b3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-phpDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-phpDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-remotePhpProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-remotePhpProject_ja.html
index bf2a900..b5868d7 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-remotePhpProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-project-ui-resources-remotePhpProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-Codeception_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-Codeception_ja.html
index 3a15c03..2b2ac84 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-Codeception_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-Codeception_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2015 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-Nette-Tester_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-Nette-Tester_ja.html
index 6f205c0..a8b886a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-Nette-Tester_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-Nette-Tester_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-PHPUnit_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-PHPUnit_ja.html
index 6cfc75f..8d346de 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-PHPUnit_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-PHPUnit_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-atoum_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-atoum_ja.html
index 178c8f0..867625b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-atoum_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Calculator-atoum_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Rent-a-Flat-Symfony_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Rent-a-Flat-Symfony_ja.html
index 1156ce8..d76d472 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Rent-a-Flat-Symfony_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Rent-a-Flat-Symfony_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Rent-a-Flat-Zend_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Rent-a-Flat-Zend_ja.html
index 891d38d..0928cb6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Rent-a-Flat-Zend_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-Rent-a-Flat-Zend_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-TodoList_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-TodoList_ja.html
index 0a5c3e5..641b6bf 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-TodoList_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-samples-descriptions-TodoList_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-smarty-resources-TplDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-smarty-resources-TplDescription_ja.html
index 4d89b38..1090e21 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-smarty-resources-TplDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-php-smarty-resources-TplDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-selenium2-php-SeleneseTestPHP_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-selenium2-php-SeleneseTestPHP_ja.html
index 9b2ab36..13213e4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-selenium2-php-SeleneseTestPHP_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/php/org-netbeans-modules-selenium2-php-SeleneseTestPHP_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/profiler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/profiler/Bundle_ja.properties
index 2bc2eec..686e048 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/profiler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/profiler/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/Bundle_ja.properties
index 05f2d69..d0e4611 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #nbproject.org.netbeans.modules.ruby.rubyproject=org.netbeans.modules.ruby.rubyproject.RubyProjectType
 #nbproject.org.netbeans.modules.ruby.railsprojects=org.netbeans.modules.ruby.railsprojects.RailsProjectType
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-application_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-application_ja.html
index 593c17f..d890fe5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-application_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-application_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-existingApplication_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-existingApplication_ja.html
index 2f2add8..49dbac6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-existingApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-existingApplication_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-rjs_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-rjs_ja.html
index 30ec9eb..ed7bffe 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-rjs_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-railsprojects-ui-resources-rjs_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rhtml-resources-templatedesc_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rhtml-resources-templatedesc_ja.html
index 081bf56..58a86e5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rhtml-resources-templatedesc_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rhtml-resources-templatedesc_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-desktop_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-desktop_ja.html
index 3f13d70..a5d4297 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-desktop_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-existingProject_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-existingProject_ja.html
index e6d5060..a9eddd8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-existingProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-existingProject_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rakefile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rakefile_ja.html
index 6eacaa4..257aba0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rakefile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rakefile_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-ruby-application_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-ruby-application_ja.html
index 498d44a..a66b414 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-ruby-application_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-ruby-application_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyclass_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyclass_ja.html
index 8134bb8..ad0b877 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyclass_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyclass_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyfile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyfile_ja.html
index e8e4a18..8a989af 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyfile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyfile_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubymodule_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubymodule_ja.html
index f902a97..e6d711c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubymodule_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubymodule_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyspec_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyspec_ja.html
index 8336ee6..ec82ced 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyspec_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubyspec_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubytest_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubytest_ja.html
index 0fa3006..6585f0b 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubytest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubytest_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubytestsuite_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubytestsuite_ja.html
index 99b6734..7649fb1 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubytestsuite_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-rubyproject-ui-resources-rubytestsuite_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-samples-depot-DepotDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-samples-depot-DepotDescription_ja.html
index a050e49..592fc58 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-samples-depot-DepotDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/ruby/org-netbeans-modules-ruby-samples-depot-DepotDescription_ja.html
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <html>
     <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/Bundle_ja.properties
index 680ee46..d78c844 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 AdvancedOption_DisplayName_MobilePlatforms=\u30e2\u30d0\u30a4\u30eb\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-cordova-resources-CordovaProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-cordova-resources-CordovaProjectDescription_ja.html
index ad93029..8a3e71a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-cordova-resources-CordovaProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-cordova-resources-CordovaProjectDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-cordova-resources-CordovaSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-cordova-resources-CordovaSampleDescription_ja.html
index 3d5d4db..b6c66c6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-cordova-resources-CordovaSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-cordova-resources-CordovaSampleDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-css-resources-CSS_template_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-css-resources-CSS_template_ja.html
index e3be138..a0f93ab 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-css-resources-CSS_template_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-css-resources-CSS_template_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-TemplateHelp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-TemplateHelp_ja.html
index 62a63ed..3321bb8 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-TemplateHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-TemplateHelp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-EmptyJETModuleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-EmptyJETModuleDescription_ja.html
index 8649572..741333a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-EmptyJETModuleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-EmptyJETModuleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2016 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-KnockoutJETModuleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-KnockoutJETModuleDescription_ja.html
index df8e8a9..cc1ad10 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-KnockoutJETModuleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-KnockoutJETModuleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2016 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewComponentInteractionSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewComponentInteractionSampleDescription_ja.html
index bdbae6b..0894152 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewComponentInteractionSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewComponentInteractionSampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewOracleJETBaseDistributionDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewOracleJETBaseDistributionDescription_ja.html
index 428fb8f..63671b4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewOracleJETBaseDistributionDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewOracleJETBaseDistributionDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2016 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewOracleJETQuickStartBasicDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewOracleJETQuickStartBasicDescription_ja.html
index d87ba20..7ab8c44 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewOracleJETQuickStartBasicDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-html-ojet-ui-resources-NewOracleJETQuickStartBasicDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-bower-ui-resources-BowerJsonDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-bower-ui-resources-BowerJsonDescription_ja.html
index 6130124..b5cc146 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-bower-ui-resources-BowerJsonDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-bower-ui-resources-BowerJsonDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-bower-ui-resources-BowerrcDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-bower-ui-resources-BowerrcDescription_ja.html
index 023a911..f1fadb9 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-bower-ui-resources-BowerrcDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-bower-ui-resources-BowerrcDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-grunt-ui-resources-GruntfileDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-grunt-ui-resources-GruntfileDescription_ja.html
index 841e992..f64ef76 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-grunt-ui-resources-GruntfileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-grunt-ui-resources-GruntfileDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-gulp-ui-resources-GulpfileDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-gulp-ui-resources-GulpfileDescription_ja.html
index ddd4007..6dad61c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-gulp-ui-resources-GulpfileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-gulp-ui-resources-GulpfileDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-jstestdriver-resources-TemplateHelp_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-jstestdriver-resources-TemplateHelp_ja.html
index cb3dafb..8144dbc 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-jstestdriver-resources-TemplateHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-jstestdriver-resources-TemplateHelp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-karma-ui-resources-KarmaConfDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-karma-ui-resources-KarmaConfDescription_ja.html
index 3744a52..3bb9631 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-karma-ui-resources-KarmaConfDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-karma-ui-resources-KarmaConfDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-ExistingNodeJsProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-ExistingNodeJsProjectDescription_ja.html
index 78d05fd..107b478 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-ExistingNodeJsProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-ExistingNodeJsProjectDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2015 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewHtml5ProjectWithNodeJsDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewHtml5ProjectWithNodeJsDescription_ja.html
index 5a361e3..f5b0645 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewHtml5ProjectWithNodeJsDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewHtml5ProjectWithNodeJsDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewListDirectorySampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewListDirectorySampleDescription_ja.html
index af32d4d..84681f6 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewListDirectorySampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewListDirectorySampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesAngularSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesAngularSampleDescription_ja.html
index 63c29d1..4fb3b4a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesAngularSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesAngularSampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesExpressSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesExpressSampleDescription_ja.html
index 5685646..4e785d0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesExpressSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesExpressSampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesKnockoutSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesKnockoutSampleDescription_ja.html
index 971ea14..dcbd6ba 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesKnockoutSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewMessagesKnockoutSampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewNodeJsProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewNodeJsProjectDescription_ja.html
index 0033a11..29d1bc4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewNodeJsProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-NewNodeJsProjectDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-PackageJsonDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-PackageJsonDescription_ja.html
index d24873e..fba561f 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-PackageJsonDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript-nodejs-ui-resources-PackageJsonDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-editor-resources-javascript_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-editor-resources-javascript_ja.html
index 5b1bb0f..ca238c4 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-editor-resources-javascript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-editor-resources-javascript_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-editor-resources-json_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-editor-resources-json_ja.html
index 254154d..60732ed 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-editor-resources-json_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-editor-resources-json_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-jade-resources-jadeTemplate_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-jade-resources-jadeTemplate_ja.html
index 2f4c0a3..e57d699 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-jade-resources-jadeTemplate_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-jade-resources-jadeTemplate_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-react-resources-reactjs_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-react-resources-reactjs_ja.html
index 34a5660..172fe6c 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-react-resources-reactjs_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-javascript2-react-resources-reactjs_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-languages-apacheconf-resources-ApacheConfFileDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-languages-apacheconf-resources-ApacheConfFileDescription_ja.html
index 5e5cafb..4731447 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-languages-apacheconf-resources-ApacheConfFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-languages-apacheconf-resources-ApacheConfFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-languages-ini-resources-EmptyINIFileDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-languages-ini-resources-EmptyINIFileDescription_ja.html
index 30fe4aa..3d31f26 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-languages-ini-resources-EmptyINIFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-languages-ini-resources-EmptyINIFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-mocha-wizard-SeleneseMochaTestWebclient_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-mocha-wizard-SeleneseMochaTestWebclient_ja.html
index 6d2ee4b..753573a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-mocha-wizard-SeleneseMochaTestWebclient_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-mocha-wizard-SeleneseMochaTestWebclient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-protractor-wizard-ProtractorConfDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-protractor-wizard-ProtractorConfDescription_ja.html
index d8843ce..9e3cd0d 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-protractor-wizard-ProtractorConfDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-protractor-wizard-ProtractorConfDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-protractor-wizard-SeleneseJasmineTestWebclient_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-protractor-wizard-SeleneseJasmineTestWebclient_ja.html
index ae77940..b13b9ee 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-protractor-wizard-SeleneseJasmineTestWebclient_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-selenium2-webclient-protractor-wizard-SeleneseJasmineTestWebclient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-AngularJSPhoneCat_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-AngularJSPhoneCat_ja.html
index 60723b0..1db32e5 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-AngularJSPhoneCat_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-AngularJSPhoneCat_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneHelloWorld_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneHelloWorld_ja.html
index 2a22188..e869c0a 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneHelloWorld_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneHelloWorld_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneJQueryMobile_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneJQueryMobile_ja.html
index ed6c50c..96d3183 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneJQueryMobile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneJQueryMobile_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneWineCellar_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneWineCellar_ja.html
index 0febafc..c1762df 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneWineCellar_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-BackboneWineCellar_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-EmberJSTrek_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-EmberJSTrek_ja.html
index 9740827..03b0231 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-EmberJSTrek_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-EmberJSTrek_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-KnockoutJSGameList_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-KnockoutJSGameList_ja.html
index 4a722bd..fa0c5c0 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-KnockoutJSGameList_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-KnockoutJSGameList_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-ResponsiveRabbits_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-ResponsiveRabbits_ja.html
index e7197f9..c070a89 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-ResponsiveRabbits_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-client-samples-resources-ResponsiveRabbits_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-ExistingClientSideProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-ExistingClientSideProjectDescription_ja.html
index 987ec6a..808f3c3 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-ExistingClientSideProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-ExistingClientSideProjectDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-NewClientSideLibraryDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-NewClientSideLibraryDescription_ja.html
index fae2c40..674a3cd 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-NewClientSideLibraryDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-NewClientSideLibraryDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-NewClientSideProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-NewClientSideProjectDescription_ja.html
index d277efd..36a7a23 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-NewClientSideProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/webcommon/org-netbeans-modules-web-clientproject-ui-resources-NewClientSideProjectDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ergonomics/performance-ergonomics/performance-ergonomics/org/netbeans/modules/performance/ergonomics/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ergonomics/performance-ergonomics/performance-ergonomics/org/netbeans/modules/performance/ergonomics/Bundle_ja.properties
index efcedf5..9865303 100755
--- a/netbeans-l10n-zip/src/ja/ergonomics/performance-ergonomics/performance-ergonomics/org/netbeans/modules/performance/ergonomics/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ergonomics/performance-ergonomics/performance-ergonomics/org/netbeans/modules/performance/ergonomics/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u30fb\u30a8\u30eb\u30b4\u30ce\u30df\u30af\u30b9\u30fb\u30c6\u30b9\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/extide/options-java/options-java/org/netbeans/modules/options/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/options-java/options-java/org/netbeans/modules/options/java/Bundle_ja.properties
index fc17244..5ed1c58 100755
--- a/netbeans-l10n-zip/src/ja/extide/options-java/options-java/org/netbeans/modules/options/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/options-java/options-java/org/netbeans/modules/options/java/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=\u300c\u30c4\u30fc\u30eb\u300d\u2192\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u30c0\u30a4\u30a2\u30ed\u30b0\u306eJava\u30d7\u30e9\u30a4\u30de\u30ea\u30fb\u30d1\u30cd\u30eb\u304c\u63d0\u4f9b\u3055\u308c\u30012\u6b21\u30d1\u30cd\u30eb\u3092\u767b\u9332\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002
 OpenIDE-Module-Name=Java\u30aa\u30d7\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/extide/options-java/options-java/org/netbeans/modules/options/java/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/options-java/options-java/org/netbeans/modules/options/java/resources/Bundle_ja.properties
index 2da1203..7d1f8dd 100755
--- a/netbeans-l10n-zip/src/ja/extide/options-java/options-java/org/netbeans/modules/options/java/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/options-java/options-java/org/netbeans/modules/options/java/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OptionsCategory_Keywords_Java=Java\u30aa\u30d7\u30b7\u30e7\u30f3
 OptionsCategory_Name_Java=Java
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/netbeans/ant/nblib/bridge/org/apache/tools/ant/module/bridge/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/netbeans/ant/nblib/bridge/org/apache/tools/ant/module/bridge/impl/Bundle_ja.properties
index c692c38..28c1715 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/netbeans/ant/nblib/bridge/org/apache/tools/ant/module/bridge/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/netbeans/ant/nblib/bridge/org/apache/tools/ant/module/bridge/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # BridgeImpl
 LBL_ant_version_unknown=<\u4e0d\u660e>
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/Bundle_ja.properties
index 9b28c00..116be74 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest
 OpenIDE-Module-Name=Ant
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/bridge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/bridge/Bundle_ja.properties
index cd35929..4540433 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/bridge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/bridge/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DummyBridgeImpl
 # {0} - exception message
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/loader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/loader/Bundle_ja.properties
index eb136ee..5e00935 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/loader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/loader/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/nodes/Bundle_ja.properties
index 7eaecd1..02e70e3 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # AntProjectNode
 LBL_proj_sheet=Ant\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/Bundle_ja.properties
index 0ae1fa9..c236377 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # File names:
 Templates/Other/Project.xml=Ant\u30d3\u30eb\u30c9\u30fb\u30b9\u30af\u30ea\u30d7\u30c8
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/CustomTaskDescription_ja.html b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/CustomTaskDescription_ja.html
index bd749ac..b22f392 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/CustomTaskDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/CustomTaskDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2001, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/ProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/ProjectDescription_ja.html
index 171fc1e..7cf5e68 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/ProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/resources/ProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2001, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/run/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/run/Bundle_ja.properties
index 31e6c17..8bd6062 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/run/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/run/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # TargetExecutor
 # {0] - project name
diff --git a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/wizards/shortcut/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/wizards/shortcut/Bundle_ja.properties
index c964478..bc1cf64 100755
--- a/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/wizards/shortcut/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extide/org-apache-tools-ant-module/org-apache-tools-ant-module/org/apache/tools/ant/module/wizards/shortcut/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_create_shortcut=\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u3092\u4f5c\u6210...
 LBL_remove_shortcut=\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u3092\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-git/odcs-git/org/netbeans/modules/odcs/git/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-git/odcs-git/org/netbeans/modules/odcs/git/Bundle_ja.properties
index b396105..1655626 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-git/odcs-git/org/netbeans/modules/odcs/git/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-git/odcs-git/org/netbeans/modules/odcs/git/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=ODCS - Git\u30d6\u30ea\u30c3\u30b8
 
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-hudson/odcs-hudson/org/netbeans/modules/odcs/hudson/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-hudson/odcs-hudson/org/netbeans/modules/odcs/hudson/Bundle_ja.properties
index a162f19..f9c8581 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-hudson/odcs-hudson/org/netbeans/modules/odcs/hudson/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-hudson/odcs-hudson/org/netbeans/modules/odcs/hudson/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_from_odcs_project=(\u958b\u767a\u8005\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304b\u3089)
 OpenIDE-Module-Name=ODCS - Hudson\u30d6\u30ea\u30c3\u30b8
 
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-kit/odcs-kit/org/netbeans/modules/odcs/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-kit/odcs-kit/org/netbeans/modules/odcs/kit/Bundle_ja.properties
index 7785fcd..495890a 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-kit/odcs-kit/org/netbeans/modules/odcs/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-kit/odcs-kit/org/netbeans/modules/odcs/kit/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=Oracle Developer Cloud Service (ODCS)\u3067\u306e\u30c1\u30fc\u30e0\u958b\u767a\u306e\u30b5\u30dd\u30fc\u30c8\u3002
 OpenIDE-Module-Name=Oracle Developer Cloud Service
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-tasks-bridge/odcs-tasks-bridge/org/netbeans/modules/odcs/tasks/bridge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-tasks-bridge/odcs-tasks-bridge/org/netbeans/modules/odcs/tasks/bridge/Bundle_ja.properties
index 47e5ed8..39180e0 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-tasks-bridge/odcs-tasks-bridge/org/netbeans/modules/odcs/tasks/bridge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-tasks-bridge/odcs-tasks-bridge/org/netbeans/modules/odcs/tasks/bridge/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # {0} - number of tasks
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/Bundle_ja.properties
index 24afa70..7017e7d 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Error=\u30a8\u30e9\u30fc
 # {0} - query name
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/issue/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/issue/Bundle_ja.properties
index 68ac181..985ac60 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/issue/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/issue/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Attachment.action.attachLog=\u30ed\u30b0\u306e\u30a2\u30bf\u30c3\u30c1
 CTL_Attachment.action.create=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/query/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/query/Bundle_ja.properties
index 5d88a11..ae9218f 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/query/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/query/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/jsch/manifest.mf
 
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/repository/Bundle_ja.properties
index 54887ac..a37fe4d 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/repository/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - repository name
 # {1} - url
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/util/Bundle_ja.properties
index 820ad5c..487529b 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-tasks/odcs-tasks/org/netbeans/modules/odcs/tasks/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Error=\u30a8\u30e9\u30fc
 CTL_KeywordsTitle=\u30bf\u30b0\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/Bundle_ja.properties
index 6a48998..e0ed999 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2012 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CONTACTING_ISSUE_TRACKER=\u554f\u984c\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u3044\u307e\u3059...
 CTL_AddInstance=\u30b5\u30fc\u30d0\u30fc\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/api/Bundle_ja.properties
index a49e6e5..a01be1a 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AddInstance=\u958b\u767a\u8005\u30b5\u30fc\u30d0\u30fc\u306e\u8ffd\u52a0
 
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/dashboard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/dashboard/Bundle_ja.properties
index 1e7a9c2..06e352d 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/dashboard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/dashboard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 A11Y_TeamProjects=\u30c1\u30fc\u30e0\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/project/Bundle_ja.properties
index 33bc07a..98df6b3 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/project/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_ProjectDetailsAction=ProjectDetails
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/project/activity/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/project/activity/Bundle_ja.properties
index d6df4b8..ff07095 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/project/activity/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/project/activity/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # {0} build number (run)
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/settings/Bundle_ja.properties
index 940a549..4fe3368 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/settings/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OdcsOptions.jLabel1.text=Oracle Developer Cloud Service\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9
 OdcsOptions.cbSync.text=\u30c0\u30c3\u30b7\u30e5\u30dc\u30fc\u30c9\u540c\u671f\u9593\u9694(\u5206\u5358\u4f4d):
 
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/share/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/share/Bundle_ja.properties
index 99543bb..13300c2 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/share/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/share/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Actions/Team/org-netbeans-modules-team-server-ui-ShareMenuAction.instance=\u30c1\u30fc\u30e0\u30fb\u30b5\u30fc\u30d0\u30fc\u3067\u306e\u30ed\u30fc\u30ab\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5171\u6709...
 CTL_ShareAction=\u30c1\u30fc\u30e0\u30fb\u30b5\u30fc\u30d0\u30fc\u3067\u306e\u5171\u6709...
 LBL_SelectServer.title=\u30c1\u30fc\u30e0\u30fb\u30b5\u30fc\u30d0\u30fc\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/utils/Bundle_ja.properties
index 4d82135..585f957 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-ui/odcs-ui/org/netbeans/modules/odcs/ui/utils/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CommandReport_OK=OK
 ERR_OpenBrowser=URL\u3092\u958b\u3051\u307e\u305b\u3093: {0}
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs-versioning/odcs-versioning/org/netbeans/modules/odcs/versioning/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs-versioning/odcs-versioning/org/netbeans/modules/odcs/versioning/Bundle_ja.properties
index ee9fec2..e298e9f 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs-versioning/odcs-versioning/org/netbeans/modules/odcs/versioning/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs-versioning/odcs-versioning/org/netbeans/modules/odcs/versioning/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_GetSourcesFromODCSAction=\u30bd\u30fc\u30b9\u306e\u53d6\u5f97(&G)...
 LBL_GetSourceFromODCSPanel.repository.external=\u5916\u90e8
 LBL_GetSourceFromODCSPanel.repository.git=Git
diff --git a/netbeans-l10n-zip/src/ja/extra/odcs/odcs/org/netbeans/modules/odcs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/odcs/odcs/org/netbeans/modules/odcs/Bundle_ja.properties
index e519c28..e029d6c 100755
--- a/netbeans-l10n-zip/src/ja/extra/odcs/odcs/org/netbeans/modules/odcs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/odcs/odcs/org/netbeans/modules/odcs/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=Oracle Developer Services\u306b\u63a5\u7d9a\u6027\u3092\u63d0\u4f9b\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/extra/team-server-nb/team-server-nb/org/netbeans/modules/team/server/nb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/team-server-nb/team-server-nb/org/netbeans/modules/team/server/nb/Bundle_ja.properties
index 3155c9c..cf52937 100755
--- a/netbeans-l10n-zip/src/ja/extra/team-server-nb/team-server-nb/org/netbeans/modules/team/server/nb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/team-server-nb/team-server-nb/org/netbeans/modules/team/server/nb/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30c1\u30fc\u30e0
 OpenIDE-Module-Name=\u30c1\u30fc\u30e0\u30fb\u30b5\u30fc\u30d0\u30fcNetBeans\u5b9f\u88c5
diff --git a/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/Bundle_ja.properties
index 97efa75..14477ec 100755
--- a/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 A11Y_TeamProjects=\u30c1\u30fc\u30e0\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 Actions/Team/org-netbeans-modules-team-server-LoginAction.instance=\u30ed\u30b0\u30a4\u30f3...
 Actions/Window/org-netbeans-modules-team-server-TeamAction.instance=\u30c1\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/common/Bundle_ja.properties
index 41a6054..bba6118 100755
--- a/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/common/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 A11Y_TeamProjects=\u30c1\u30fc\u30e0\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/picker/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/picker/Bundle_ja.properties
index 932b838..fc8f0f9 100755
--- a/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/picker/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/picker/Bundle_ja.properties
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Ctl_LOGOUT=\u30ed\u30b0\u30a2\u30a6\u30c8
 Ctl_LOGIN=\u30ed\u30b0\u30a4\u30f3
diff --git a/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/spi/Bundle_ja.properties
index 6d3520a..74d0af1 100755
--- a/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/extra/team-server/team-server/org/netbeans/modules/team/server/ui/spi/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # builder job status is 'failed'
 LBL_Failed=\u5931\u6557
 # builder job status is 'running'
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-antproject/groovy-antproject/org/netbeans/modules/groovy/antproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-antproject/groovy-antproject/org/netbeans/modules/groovy/antproject/Bundle_ja.properties
index 781e19d..5227cf9 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-antproject/groovy-antproject/org/netbeans/modules/groovy/antproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-antproject/groovy-antproject/org/netbeans/modules/groovy/antproject/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Ant\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306eGroovy
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-antproject/groovy-antproject/org/netbeans/modules/groovy/antproject/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-antproject/groovy-antproject/org/netbeans/modules/groovy/antproject/base/Bundle_ja.properties
index 9ba685f..dbd8b22 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-antproject/groovy-antproject/org/netbeans/modules/groovy/antproject/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-antproject/groovy-antproject/org/netbeans/modules/groovy/antproject/base/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_No_Build_XML_Found=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30d3\u30eb\u30c9\u30fb\u30b9\u30af\u30ea\u30d7\u30c8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 
 ACTION_test=\u30c6\u30b9\u30c8
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/Bundle_ja.properties
index c3a2430..d74298b 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Groovy\u30a8\u30c7\u30a3\u30bf
 OpenIDE-Module-Display-Category=Groovy
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/actions/Bundle_ja.properties
index 66dd48a..1df724b 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 fix-groovy-imports=\u30a4\u30f3\u30dd\u30fc\u30c8\u3092\u4fee\u6b63
 fix-groovy-imports-description=import\u6587\u306e\u4fee\u6b63
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/api/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/api/completion/Bundle_ja.properties
index e7676d1..c9490fb 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/api/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/api/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GroovyCompletion_NoJavaDocFound=<h2>JDK/GDK\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u898b\u3064\u3051\u3089\u308c\u307e\u305b\u3093\u3002</h2><br>\u300c\u30c4\u30fc\u30eb\u300d\u2192\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u2192\u300c\u305d\u306e\u4ed6\u300d\u2192\u300cGroovy\u300d\u3067GDK 2.4.5\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u3092\u69cb\u6210\u3067\u304d\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/api/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/api/parser/Bundle_ja.properties
index e2f4eee..aa90bb8 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/api/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/api/parser/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9(&S)
 GroovyResolver=Groovy\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/hints/Bundle_ja.properties
index 55cf10a..77e980b 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/hints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AddIfAroundBlockHintDescription=if (\u5f0f) {...|}\u306e\u5f62\u5f0f\u3067\u56f2\u3080
 AddMissingMethodsStub=\u3059\u3079\u3066\u306e\u62bd\u8c61\u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5
 # {0} - fully qualified name of the class we want to import
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/imports/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/imports/Bundle_ja.properties
index cb3e529..b9b9954 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/imports/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/imports/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 FixImportsDialogTitle=\u3059\u3079\u3066\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u3092\u4fee\u6b63
 FixDupImportStmts_Combo_ACSD=\u9069\u5207\u306a\u5b8c\u5168\u4fee\u98fe\u540d\u3092\u9078\u629e
 FixDupImportStmts_Combo_Name_ACSD=\u5b8c\u5168\u4fee\u98fe\u540d
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/language/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/language/Bundle_ja.properties
index c750ccd..58d8106 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/language/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/language/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FileDeleted=\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002IDE\u4ee5\u5916\u3067\u524a\u9664\u3055\u308c\u305f\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\n\u30e6\u30fc\u30b6\u30fc\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306evar/cache/gsf-index\n\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u524a\u9664\u3059\u308b\u3053\u3068\u3067\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u5f37\u5236\u7684\u306b\u66f4\u65b0\u3067\u304d\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/resources/Bundle_ja.properties
index e1ad7f5..0f9fbb0 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-editor/groovy-editor/org/netbeans/modules/groovy/editor/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/api/Bundle_ja.properties
index 5921d4b..4b294a9 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_GrailsNotConfigured=Grails\u304c\u69cb\u6210\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u300c\u30c4\u30fc\u30eb\u300d\u2192\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u2192\u300c\u305d\u306e\u4ed6\u300d\u2192\u300cGroovy\u300d\u306b\u79fb\u52d5\u3057\u3066Grails\u306e\u30db\u30fc\u30e0\u3092\u69cb\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 MSG_StartFailedIOE=Grails\u306e\u958b\u59cb\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002{0}\u30b9\u30af\u30ea\u30d7\u30c8\u304c\u5b9f\u884c\u53ef\u80fd\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/resources/Bundle_ja.properties
index 3ca6554..a0f12c3 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Groovy
 OpenIDE-Module-Long-Description=Grails\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3078\u306e\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9
 OpenIDE-Module-Name=Grails\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/server/Bundle_ja.properties
index a5a6cbd..0787f92 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/server/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GrailsInstance.displayName=Jetty (Grails {0})
 GrailsInstance.unknownVersion=\u4e0d\u660e\u306a\u30d0\u30fc\u30b8\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/settings/Bundle_ja.properties
index 5b4033b..a6ccf59 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grails/groovy-grails/org/netbeans/modules/groovy/grails/settings/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AdvancedOption_DisplayName_GrailsRuntime=Grails
 AdvancedOption_Tooltip_GrailsRuntime=Grails\u30e9\u30f3\u30bf\u30a4\u30e0\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/Bundle_ja.properties
index 294c684..79ee7b6 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_GenerateAction=\u751f\u6210...
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/actions/Bundle_ja.properties
index c714d30..0be5d18 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_GenerateAllAction=\u3059\u3079\u3066\u3092\u751f\u6210
 CTL_GenerateViewsAction=\u30d3\u30e5\u30fc\u3092\u751f\u6210
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/commands/Bundle_ja.properties
index 6055b5d..73d6d2a 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/commands/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # RakeRunnerAction
 #RakeRunnerAction.RunDebugRakeTask=Run/Debug Rake Task...
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/plugins/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/plugins/Bundle_ja.properties
index e03683a..26638da 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/plugins/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/plugins/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 PluginInstallPleaseWait={0}\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u3044\u307e\u3059
 PluginUninstallPleaseWait={0}\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30a2\u30f3\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u3044\u307e\u3059
 Installation=\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Bundle_ja.properties
index bb78929..0d5e566 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Controller_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Controller_ja.html
index 1dc2f94..e7c402e 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Controller_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Controller_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/DomainClass_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/DomainClass_ja.html
index 4873d4e..348046c 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/DomainClass_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/DomainClass_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/GantScript_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/GantScript_ja.html
index 139ebf1..64b5625 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/GantScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/GantScript_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest_ja.html
index 0c4e5c5..d5fe74e 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/IntegrationTest_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Service_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Service_ja.html
index b91f12a..3cc272f 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Service_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/Service_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/TagLib_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/TagLib_ja.html
index 82536e0..eedf8e4 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/TagLib_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/TagLib_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/UnitTest_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/UnitTest_ja.html
index 396f1b7..5c3722c 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/UnitTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/UnitTest_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/desktop_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/desktop_ja.html
index 36e2826..d2541d4 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/desktop_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/emptyProject_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/emptyProject_ja.html
index ce5a798..86cb41a 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/resources/emptyProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/Bundle_ja.properties
index 5f0bd59..9a71094 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FetchingPlugins=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044... \u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u4e00\u89a7\u3092\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u30d5\u30a7\u30c3\u30c1\u4e2d
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle_ja.properties
index 44c3d98..fc92f20 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GeneralCustomizerPanel.grailsServerPortLabel.text=\u30b5\u30fc\u30d0\u30fc\u30fb\u30dd\u30fc\u30c8:
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle_ja.properties
index 1a53d95..a5dcfad 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Controller=Grails\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9
 DomainClass=Grails\u30c9\u30e1\u30a4\u30f3\u30fb\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle_ja.properties
index 7b4f672..170c22c 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-grailsproject/groovy-grailsproject/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # GrailsTargetChooserPanelGUI
 LBL_GrailsTargetChooserPanelGUI_Name=\u540d\u524d\u3068\u5834\u6240
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/Bundle_ja.properties
index eea03a8..fbf942c 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9(&S)
 GspResolver=Gsp\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/Bundle_ja.properties
index 191d044..df585b7 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Groovy
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u4f7f\u7528\u3059\u308b\u3068\u3001\u69cb\u6587\u306e\u5f37\u8abf\u8868\u793a\u3084\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u306a\u3069\u306eGroovy Server Pages (GSP)\u306e\u30b5\u30dd\u30fc\u30c8\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3059\u3002
 OpenIDE-Module-Short-Description=Groovy Server Pages (GSP)\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/GspTemplate_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/GspTemplate_ja.html
index 2d7835b..a38bed9 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/GspTemplate_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-gsp/groovy-gsp/org/netbeans/modules/groovy/gsp/resources/GspTemplate_ja.html
@@ -5,43 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-kit/groovy-kit/org/netbeans/modules/groovy/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-kit/groovy-kit/org/netbeans/modules/groovy/kit/Bundle_ja.properties
index cdff5fe..031d25b 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-kit/groovy-kit/org/netbeans/modules/groovy/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-kit/groovy-kit/org/netbeans/modules/groovy/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Groovy
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u4f7f\u7528\u3059\u308b\u3068\u3001NetBeans\u5185\u3067\u4f7f\u7528\u3067\u304d\u308b\u3059\u3079\u3066\u306eGroovy\u304a\u3088\u3073Grails\u306e\u6a5f\u80fd\u3092\u4f7f\u7528\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002\u3053\u308c\u306f\u3001\u3053\u306e\u9818\u57df\u306b\u3042\u308b\u500b\u3005\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u3059\u3079\u3066\u306e\u30e9\u30c3\u30d1\u30fc\u3067\u3059\u3002
 OpenIDE-Module-Name=Groovy\u304a\u3088\u3073Grails
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/Bundle_ja.properties
index 5c9eb56..b8baa41 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_CannotRenameLoc=\u3053\u3053\u3067\u540d\u524d\u306f\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
 ERR_CannotFindUsages=\u3053\u3053\u3067\u4f7f\u7528\u72b6\u6cc1\u3092\u691c\u7d22\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/move/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/move/Bundle_ja.properties
index 7dfa246..29d133e 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/move/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/move/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Move=\u79fb\u52d5
 LBL_Move_Descr=Groovy\u8981\u7d20\u306e\u79fb\u52d5
 LBL_MoveClassNamed=\u30af\u30e9\u30b9{0}\u3092\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/rename/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/rename/Bundle_ja.properties
index 73b96d7..382e659 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/rename/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/rename/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Rename=\u540d\u524d\u5909\u66f4
 LBL_Rename_Descr=Groovy\u8981\u7d20\u306e\u540d\u524d\u306e\u5909\u66f4
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/resources/Bundle_ja.properties
index ce22a29..7f4a452 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Groovy
 OpenIDE-Module-Name=Groovy\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
 OpenIDE-Module-Short-Description=Groovy\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/ui/Bundle_ja.properties
index 565a120..fe1c791 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-refactoring/groovy-refactoring/org/netbeans/modules/groovy/refactoring/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Rename=\u540d\u524d\u5909\u66f4
 LBL_RenameComments=\u540d\u524d\u5909\u66f4\u3092\u30b3\u30e1\u30f3\u30c8\u306b\u9069\u7528(&C)
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/Bundle_ja.properties
index 0dbbe35..b5e6588 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Groovy
 OpenIDE-Module-Name=Groovy\u306e\u30b5\u30f3\u30d7\u30eb
 OpenIDE-Module-Short-Description=Groovy\u304a\u3088\u3073Grails\u306e\u30b5\u30f3\u30d7\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/gjdemo/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/gjdemo/Bundle_ja.properties
index 81b0481..fd0e2c1 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/gjdemo/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/gjdemo/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_CreateProjectStep=\u540d\u524d\u3068\u5834\u6240
 LBL_TXT_NewGroovyJavaSample=Groovy-Java\u306e\u30c7\u30e2\u30fb\u30b5\u30f3\u30d7\u30eb
 GroovyJavaDemoPanelVisual.projectNameLabel.text=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d(&N):
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoDescription_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoDescription_ja.html
index 0d01c02..c13e61c 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/nbprojectgen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/nbprojectgen/Bundle_ja.properties
index 15ce0a8..e7994aa 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/nbprojectgen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/nbprojectgen/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_CreateProjectStep=\u540d\u524d\u3068\u5834\u6240
 LBL_TXT_NBProjectGenerators=NB\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b8\u30a7\u30cd\u30ec\u30fc\u30bf\u30fb\u30b5\u30f3\u30d7\u30eb
 NBProjectGeneratorsPanelVisual.createdFolderLabel.text=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0(&F):
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsDescription_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsDescription_ja.html
index 36f621d..de88b94 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-samples/groovy-samples/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/Bundle_ja.properties
index c86afc5..702a9f5 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_GroovySetting=Groovy
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/actions/Bundle_ja.properties
index 56f669e..2b48223 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_CompileFile_Action=\u30d5\u30a1\u30a4\u30eb\u306e\u30b3\u30f3\u30d1\u30a4\u30eb
 LBL_DebugFile_Action=\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30d0\u30c3\u30b0
 LBL_DebugTestFile_Action=\u30c6\u30b9\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/api/Bundle_ja.properties
index 94f35a2..ab17822 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AdvancedOption_DisplayName_Support=Groovy
 AdvancedOption_Tooltip_Support=Groovy\u306e\u69cb\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/debug/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/debug/Bundle_ja.properties
index 7f5df18..ef2fb0f 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/debug/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/debug/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_Default_Print_Text=\u30b9\u30ec\u30c3\u30c9{threadName}\u304c{groovyName}\u5185\u306e\u884c{lineNumber}\u4f4d\u7f6e\u3067\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306b\u9054\u3057\u307e\u3057\u305f\u3002
 LBL_Action_Customize=\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
 LBL_Action_Go_To_Source=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/options/Bundle_ja.properties
index c4224bc..583ae56 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OptionsCategory_Groovy=Groovy
 # Followed by a URL where Groovy can be downloaded
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/Bundle_ja.properties
index 978f137..38b0455 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Groovy
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001Groovy\u7528\u306e\u652f\u63f4\u30bf\u30b9\u30af\u306e\u4e00\u90e8\u3092\u7ba1\u7406\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyClass_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyClass_ja.html
index 61c0f08..678ecac 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyClass_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyClass_ja.html
@@ -5,43 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest_ja.html
index c12fcb7..75b2fe2 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyJUnitTest_ja.html
@@ -3,43 +3,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyScript_ja.html b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyScript_ja.html
index fdcae42..9ef7819 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/resources/GroovyScript_ja.html
@@ -5,43 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/wizard/Bundle_ja.properties
index 0e1f682..3e291cc 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_NewGroovyFileWizardIterator_WizardProgress_CreatingFile=<html>\u65b0\u898fGroovy\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059</html>
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/wizard/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/wizard/impl/Bundle_ja.properties
index c03c783..40991da 100755
--- a/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/wizard/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/groovy-support/groovy-support/org/netbeans/modules/groovy/support/wizard/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 junitlib_confirm_accept=JUnit\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
 junitlib_confirm_text=<html><p>JUnit\u30c6\u30b9\u30c8\u3092\u4f5c\u6210\u3059\u308b\u306b\u306f\u3001IDE\u3067JUnit\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002</p><p>\u4f5c\u696d\u3092\u7d9a\u3051\u307e\u3059\u304b?<p>
diff --git a/netbeans-l10n-zip/src/ja/groovy/libs-groovy/libs-groovy/org/netbeans/modules/libs/groovy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/libs-groovy/libs-groovy/org/netbeans/modules/libs/groovy/Bundle_ja.properties
index b663317..6089ff1 100755
--- a/netbeans-l10n-zip/src/ja/groovy/libs-groovy/libs-groovy/org/netbeans/modules/libs/groovy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/libs-groovy/libs-groovy/org/netbeans/modules/libs/groovy/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Groovy\u30d0\u30a4\u30ca\u30ea
 
 
diff --git a/netbeans-l10n-zip/src/ja/groovy/maven-groovy/maven-groovy/org/netbeans/modules/maven/groovy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/groovy/maven-groovy/maven-groovy/org/netbeans/modules/maven/groovy/Bundle_ja.properties
index c517067..2c54f31 100755
--- a/netbeans-l10n-zip/src/ja/groovy/maven-groovy/maven-groovy/org/netbeans/modules/maven/groovy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/groovy/maven-groovy/maven-groovy/org/netbeans/modules/maven/groovy/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Maven Groovy
 SG_GroovySources=Groovy\u30d1\u30c3\u30b1\u30fc\u30b8
 SG_Test_GroovySources=Groovy\u30c6\u30b9\u30c8\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8
diff --git a/netbeans-l10n-zip/src/ja/harness/apisupport-harness/apisupport-harness/org/netbeans/modules/apisupport/harness/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/apisupport-harness/apisupport-harness/org/netbeans/modules/apisupport/harness/Bundle_ja.properties
index 34c5867..6cee5d7 100755
--- a/netbeans-l10n-zip/src/ja/harness/apisupport-harness/apisupport-harness/org/netbeans/modules/apisupport/harness/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/apisupport-harness/apisupport-harness/org/netbeans/modules/apisupport/harness/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest
 OpenIDE-Module-Name=\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d3\u30eb\u30c9\u30fb\u30cf\u30fc\u30cd\u30b9
diff --git a/netbeans-l10n-zip/src/ja/harness/jellytools-platform/jellytools-platform/org/netbeans/modules/jellytools/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/jellytools-platform/jellytools-platform/org/netbeans/modules/jellytools/platform/Bundle_ja.properties
index d67ea8f..3d123cf 100755
--- a/netbeans-l10n-zip/src/ja/harness/jellytools-platform/jellytools-platform/org/netbeans/modules/jellytools/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/jellytools-platform/jellytools-platform/org/netbeans/modules/jellytools/platform/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Jelly Tools\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
 
diff --git a/netbeans-l10n-zip/src/ja/harness/jemmy/jemmy/org/netbeans/modules/jemmy/idemodule/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/jemmy/jemmy/org/netbeans/modules/jemmy/idemodule/Bundle_ja.properties
index 59c8221..3e390ab 100755
--- a/netbeans-l10n-zip/src/ja/harness/jemmy/jemmy/org/netbeans/modules/jemmy/idemodule/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/jemmy/jemmy/org/netbeans/modules/jemmy/idemodule/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Author: <a href="mailto:adam.sotona@sun.com">Adam Sotona</a>
 
 # Module properties:
diff --git a/netbeans-l10n-zip/src/ja/harness/nbjunit/nbjunit/org/netbeans/junit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/nbjunit/nbjunit/org/netbeans/junit/Bundle_ja.properties
index 5f86fea..26a9570 100755
--- a/netbeans-l10n-zip/src/ja/harness/nbjunit/nbjunit/org/netbeans/junit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/nbjunit/nbjunit/org/netbeans/junit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Long-Description=assertGC\u3001assertSize\u3001getWorkDir\u3001LineDiff\u306a\u3069\u3092\u542b\u3080\u3001JUnit\u5411\u3051\u306eNetBeans\u62e1\u5f35\u6a5f\u80fd\u3002
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-insane/org-netbeans-insane/org/netbeans/insane/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-insane/org-netbeans-insane/org/netbeans/insane/impl/Bundle_ja.properties
index 16ce2df..d2daf2d 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-insane/org-netbeans-insane/org/netbeans/insane/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-insane/org-netbeans-insane/org/netbeans/insane/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=INSANE
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-ant/org-netbeans-libs-nbi-ant/org/netbeans/libs/nbi/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-ant/org-netbeans-libs-nbi-ant/org/netbeans/libs/nbi/ant/Bundle_ja.properties
index 91808ae..46d2b87 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-ant/org-netbeans-libs-nbi-ant/org/netbeans/libs/nbi/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-ant/org-netbeans-libs-nbi-ant/org/netbeans/libs/nbi/ant/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Name=NBI Ant\u30e9\u30a4\u30d6\u30e9\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/Bundle_ja.properties
index 7a89e1a..974bdfb 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/downloader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/downloader/Bundle_ja.properties
index 6193c8a..4c59ee2 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/downloader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/downloader/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/downloader/connector/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/downloader/connector/Bundle_ja.properties
index 6f979b5..81b4342 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/downloader/connector/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/downloader/connector/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/Bundle_ja.properties
index 1837af9..0f32823 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 R.loading.local.registry=\u30ed\u30fc\u30ab\u30eb\u30fb\u30ec\u30b8\u30b9\u30c8\u30ea[{0}]\u3092\u30ed\u30fc\u30c9\u4e2d
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/components/Bundle_ja.properties
index dc26358..5d46066 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/product/components/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/Bundle_ja.properties
index 13902f0..d23273d 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 LM.error.cannot.write=\u30ed\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u66f8\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30ed\u30b0\u51fa\u529b\u304c\u7121\u52b9\u306b\u306a\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/applications/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/applications/Bundle_ja.properties
index 1759bd4..2d1bc3c 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/applications/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/applications/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 JU.error.verification=JDK\u306e\u691c\u8a3c\u624b\u7d9a\u304d\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/cli/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/cli/options/Bundle_ja.properties
index 01db48f..33912bd 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/cli/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/cli/options/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/helper/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/helper/Bundle_ja.properties
index 463aeb7..0b41024 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/helper/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/helper/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################ 
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/helper/swing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/helper/swing/Bundle_ja.properties
index 075f47d..c7aa820 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/helper/swing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/helper/swing/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/progress/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/progress/Bundle_ja.properties
index f83f3c0..1df21e5 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/progress/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/progress/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/launchers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/launchers/Bundle_ja.properties
index dc7f235..f669f7b 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/launchers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/launchers/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 LP.error.cannot.load.bundle=\u30d0\u30f3\u30c9\u30eb\u3092{0}\u304b\u3089\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/launchers/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/launchers/impl/Bundle_ja.properties
index 339f06b..ce43feb 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/launchers/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/launchers/impl/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #############################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/resolver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/resolver/Bundle_ja.properties
index 2bc5d53..111aa7d 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/resolver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/resolver/Bundle_ja.properties
@@ -1,39 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 NR.error.cannot.get.default.apps.location=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5834\u6240\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093
 SR.error.cannot.parse.pattern=\u30d1\u30bf\u30fc\u30f3\u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093: {0}
 
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/windows/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/windows/Bundle_ja.properties
index 7d90cc7..7a520e4 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/windows/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/utils/system/windows/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 WR.error.cannot.access.native=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30e1\u30bd\u30c3\u30c9\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/Bundle_ja.properties
index 50d20a8..236cfa8 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/Bundle_ja.properties
index de2de98..57fbe73 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/actions/Bundle_ja.properties
index 991deb5..04c0729 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/actions/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/panels/Bundle_ja.properties
index 60103d1..8d2fd58 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/components/panels/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/containers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/containers/Bundle_ja.properties
index 4b33c1d..2559312 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/containers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/containers/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/utils/Bundle_ja.properties
index 6b8df85..ee3706d 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/ext/nbi-engine/org/netbeans/installer/wizard/utils/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/org-netbeans-libs-nbi-engine/org/netbeans/libs/nbi/engine/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/org-netbeans-libs-nbi-engine/org/netbeans/libs/nbi/engine/Bundle_ja.properties
index 06aca8e..d8fff04 100755
--- a/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/org-netbeans-libs-nbi-engine/org/netbeans/libs/nbi/engine/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/harness/org-netbeans-libs-nbi-engine/org-netbeans-libs-nbi-engine/org/netbeans/libs/nbi/engine/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Name=NBI\u30a8\u30f3\u30b8\u30f3\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/Bundle_ja.properties
index f5b012a..d33a5be 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30c1\u30fc\u30e0
 OpenIDE-Module-Name=\u554f\u984c\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u30fb\u30d6\u30ea\u30c3\u30b8\u306e\u30e2\u30b8\u30e5\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/exportdiff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/exportdiff/Bundle_ja.properties
index 519b29d..1985198 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/exportdiff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/exportdiff/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_VCSHook=\u30bf\u30b9\u30af\u306e\u66f4\u65b0
 LBL_FormatTitle=\u66f8\u5f0f\u3092\u6307\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/nodes/Bundle_ja.properties
index 849da00..1738737 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/bridge/nodes/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_BugtrackingNode=\u30bf\u30b9\u30af\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea
 LBL_CreateRepository=\u30bf\u30b9\u30af\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4f5c\u6210...
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/hyperlink/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/hyperlink/Bundle_ja.properties
index 3b6bf4d..9eb02a0 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/hyperlink/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/hyperlink/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_OpenIssue=\u30bf\u30b9\u30af{0}\u3092\u958b\u304f
 
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/vcs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/vcs/Bundle_ja.properties
index 1c00586..bfaf98a 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/vcs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking-bridge/bugtracking-bridge/org/netbeans/modules/bugtracking/vcs/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking-commons/bugtracking-commons/org/netbeans/modules/bugtracking/commons/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking-commons/bugtracking-commons/org/netbeans/modules/bugtracking/commons/Bundle_ja.properties
index b323a93..5eecc0c 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking-commons/bugtracking-commons/org/netbeans/modules/bugtracking/commons/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking-commons/bugtracking-commons/org/netbeans/modules/bugtracking/commons/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u554f\u984c\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0Commons
 OpenIDE-Module-Display-Category=\u30c1\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking-commons/bugtracking-commons/org/netbeans/modules/bugtracking/issuetable/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking-commons/bugtracking-commons/org/netbeans/modules/bugtracking/issuetable/Bundle_ja.properties
index f129824..b0c1eb8 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking-commons/bugtracking-commons/org/netbeans/modules/bugtracking/issuetable/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking-commons/bugtracking-commons/org/netbeans/modules/bugtracking/issuetable/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSN_IssueTable = \u30bf\u30b9\u30af\u306e\u30ea\u30b9\u30c8
 ACSD_IssueTable = \u3053\u306e\u554f\u5408\u305b\u306b\u3088\u308a\u8fd4\u3055\u308c\u305f\u3059\u3079\u3066\u306e\u30bf\u30b9\u30af\u3092\u30ea\u30b9\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/Bundle_ja.properties
index d273d8c..0c54b1e 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Actions/Window/org-netbeans-modules-bugtracking-query-QueryAction.instance=\u554f\u5408\u305b
 
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/jira/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/jira/Bundle_ja.properties
index db71610..30a47aa 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/jira/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/jira/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MissingJiraSupportPanel.downloadButton.text=JIRA\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
 LBL_FakeJiraNameTooltip=JIRA\u30bf\u30b9\u30af\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/settings/Bundle_ja.properties
index fe85840..bb2902f 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/settings/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 DashboardOptions.jLabel1.text=\u540c\u671f
 DashboardOptions.jLabel4.text=\u30bf\u30b9\u30af\u5236\u9650
 DashboardOptions.jLabel5.text=\u30bf\u30b9\u30af
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/Bundle_ja.properties
index 50e068e..54de59c 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ChooseDate=\u65e5\u4ed8\u306e\u9078\u629e...
 # {0} - date
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/actions/Bundle_ja.properties
index ea0dc73..ee8e012 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CloseNode=\u9589\u3058\u308b
 CTL_OpenNode=\u958b\u304f
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/dashboard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/dashboard/Bundle_ja.properties
index 832ba4e..7fe836b 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/dashboard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/tasks/dashboard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_AutoRefreshOff=\u81ea\u52d5\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u304c\u30aa\u30d5\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/team/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/team/Bundle_ja.properties
index 8814b56..cbdd56a 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/team/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/team/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/issue/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/issue/Bundle_ja.properties
index 51faea3..1c2e8ee 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/issue/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/issue/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Discard=\u7834\u68c4
 #Actions/Window/org-netbeans-modules-bugtracking-IssueAction.instance=Issue
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/query/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/query/Bundle_ja.properties
index 956d083..a4d90e4 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/query/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/query/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Discard=\u7834\u68c4
 CTL_QueryAction=\u30bf\u30b9\u30af\u306e\u691c\u7d22(&F)...
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/repository/Bundle_ja.properties
index f1a1e80..9c521ef 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/repository/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 RepositoryComboSupport.loadingRepositories=\u30bf\u30b9\u30af\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30ed\u30fc\u30c9\u4e2d...
 RepositoryComboSupport.noRepositories=\u4e0d\u660e\u306a\u30bf\u30b9\u30af\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/search/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/search/Bundle_ja.properties
index 0f12472..a0c2f98 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/search/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/search/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 QuickSearchPopup.searchingLabel.text=\u691c\u7d22\u3057\u3066\u3044\u307e\u3059 ...
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/selectors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/selectors/Bundle_ja.properties
index 06c074c..2f95e3e 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/selectors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/ui/selectors/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 SelectorPanel.connectorLabel.text=\u30b3\u30cd\u30af\u30bf(&C):
diff --git a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/util/Bundle_ja.properties
index 4108add..bcdd51f 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugtracking/bugtracking/org/netbeans/modules/bugtracking/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 password_keyring_description={0}\u306e\u30d1\u30b9\u30ef\u30fc\u30c9
 
diff --git a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/Bundle_ja.properties
index ee618ba..598b042 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=Bugzilla\u30bf\u30b9\u30af\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30b5\u30dd\u30fc\u30c8(\u30d0\u30fc\u30b8\u30e7\u30f34.0\u307e\u3067)
diff --git a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/commands/Bundle_ja.properties
index 46d20e9..9e1557f 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/commands/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/jsch/manifest.mf
 LBL_Authenticate=\u7121\u52b9\u306a\u30e6\u30fc\u30b6\u30fc\u540d\u3068\u30d1\u30b9\u30ef\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/issue/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/issue/Bundle_ja.properties
index edc4e67..7c932cc 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/issue/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/issue/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BugzillaIssue.attachment.noDescription=<\u8aac\u660e\u306a\u3057>
 CTL_Attachment.action.attachLog=\u30ed\u30b0\u306e\u30a2\u30bf\u30c3\u30c1
diff --git a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/kenai/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/kenai/Bundle_ja.properties
index cccd964..ce58998 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/kenai/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/kenai/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_WrongProjectWarning=\u30bf\u30b9\u30af{0}\u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8''{1}''\u306b\u5c5e\u3057\u3066\u3044\u307e\u305b\u3093\u3002\n\u958b\u304d\u307e\u3059\u304b\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/query/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/query/Bundle_ja.properties
index 500703c..68c22b3 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/query/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/query/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Discard=\u7834\u68c4
 LBL_Save=\u4fdd\u5b58
diff --git a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/repository/Bundle_ja.properties
index 972c493..03b0425 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/repository/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/jsch/manifest.mf
 RepositoryPanel.jLabel1.text=\u30bf\u30b9\u30af\u30fb\u30ea\u30dd\u30b8\u30c8\u30eaURL:
diff --git a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/util/Bundle_ja.properties
index 34c2aeb..cc7fcc3 100755
--- a/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/bugzilla/bugzilla/org/netbeans/modules/bugzilla/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Cancel=\u53d6\u6d88
 CTL_KeywordsTitle=\u30ad\u30fc\u30ef\u30fc\u30c9\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/Bundle_ja.properties
index 5b49954..1240d55 100755
--- a/netbeans-l10n-zip/src/ja/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BN_Cancel=\u53d6\u6d88
 BN_Inspect=\u691c\u67fb
 CTL_RunAnalysisAction=\u691c\u67fb(&E)...
@@ -16,46 +33,7 @@
 LBL_PleaseWait=\u8a08\u7b97\u4e2d...
 LBL_Predefined=\u4e8b\u524d\u5b9a\u7fa9\u6e08
 LBL_RunAllAnalyzers=\u3059\u3079\u3066\u306e\u30a2\u30ca\u30e9\u30a4\u30b6
-# {0} - the analyzer that should be run
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
-OpenIDE-Module-Name=Static Analysis\u30b3\u30a2
+penIDE-Module-Name=Static Analysis\u30b3\u30a2
 RunAnalysisPanel.jLabel1.text=\u30b9\u30b3\u30fc\u30d7(&P):
 RunAnalysisPanel.jLabel2.text=\u4f7f\u7528:
 RequiredPluginsPanel.install.text=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/ui/Bundle_ja.properties
index ce13676..d5a5b1e 100755
--- a/netbeans-l10n-zip/src/ja/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/code-analysis/code-analysis/org/netbeans/modules/analysis/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AnalysisResult2.refreshButton.toolTipText=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
 AnalysisResult2.previousError.toolTipText=\u524d\u306e\u554f\u984c
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/api/Bundle_ja.properties
index 3271b75..d34240b 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=\u5171\u901a\u30b9\u30af\u30ea\u30d7\u30c8\u4f5c\u6210\u8a00\u8a9eAPI (\u65b0)
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/core/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/core/Bundle_ja.properties
index 3103ed4..db69163 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/core/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/core/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DESC_tlIndexerName=\u8a00\u8a9e\u30d2\u30f3\u30c8\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u308b\u30bf\u30b9\u30af
 DN_tlIndexerName=\u30d2\u30f3\u30c8\u30fb\u30d9\u30fc\u30b9\u306e\u30bf\u30b9\u30af
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/Bundle_ja.properties
index e7004b5..f4a1994 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 generate-goto-popup=\u30ca\u30d3\u30b2\u30fc\u30c8
 goto_source_open_source_not_formatted=\u30bd\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/codetemplates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/codetemplates/Bundle_ja.properties
index b48de39..618c414 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/codetemplates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/codetemplates/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 JCT-scanning-in-progress=\u30b9\u30ad\u30e3\u30f3\u4e2d\u306b\u30b3\u30fc\u30c9\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u521d\u671f\u5316\u3067\u304d\u307e\u305b\u3093...
 
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/completion/Bundle_ja.properties
index fd85303..24278c4 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 scanning-in-progress=\u30b9\u30ad\u30e3\u30f3\u4e2d...
 ListTruncated=\u4e00\u90e8\u306e\u7d50\u679c\u306f\u7701\u7565\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u691c\u7d22\u7d50\u679c\u3092\u7d5e\u308b\u306b\u306f\u3001\u3055\u3089\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/fold/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/fold/Bundle_ja.properties
index 848ebb7..fafe68d 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/fold/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/fold/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 FT_label_imports=\u30a4\u30f3\u30dd\u30fc\u30c8\u307e\u305f\u306f\u30a4\u30f3\u30af\u30eb\u30fc\u30c9
 FT_label_innerclass=\u5185\u90e8\u30af\u30e9\u30b9
 FT_label_othercodeblocks=\u4ed6\u306e\u30b3\u30fc\u30c9\u30fb\u30d6\u30ed\u30c3\u30af
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/hyperlink/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/hyperlink/Bundle_ja.properties
index e265110..61d6645 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/hyperlink/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/hyperlink/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2007-2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ChooseDecl=\u5ba3\u8a00\u3078\u79fb\u52d5
 InvalidLoc=\u5834\u6240\u304c\u7121\u52b9\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/overridden/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/overridden/Bundle_ja.properties
index 3c661da..11c0a26 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/overridden/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/overridden/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CAP_Implements=\u5b9f\u88c5\u3057\u3066\u3044\u308b
 CAP_Overrides=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3057\u3066\u3044\u308b
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/semantic/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/semantic/Bundle_ja.properties
index bb38558..1817e81 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/semantic/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/editor/semantic/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 inforumation:
-# "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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #FIX_Remove_Unused_Import=Remove Unused Import
 #FIX_All_Remove_Unused_Import=Remove All Unused Imports
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/hints/infrastructure/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/hints/infrastructure/Bundle_ja.properties
index 1dbb29a..602d3ae 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/hints/infrastructure/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/hints/infrastructure/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DisableHint=\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u30c0\u30a4\u30a2\u30ed\u30b0\u3067\u306e\u30d2\u30f3\u30c8\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
 PreviewHint=\u30d7\u30ec\u30d3\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/Bundle_ja.properties
index aa758d7..01bfb16 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/actions/Bundle_ja.properties
index 96e10a3..b0f9367 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #OverrideAction
 LBL_override=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/base/Bundle_ja.properties
index d3366d9..e8272ca 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-api/csl-api/org/netbeans/modules/csl/navigation/base/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CellRenderer
 MSG_PleaseWait=\u30b9\u30ad\u30e3\u30f3\u4e2d...
diff --git a/netbeans-l10n-zip/src/ja/ide/csl-types/csl-types/org/netbeans/modules/csl/types/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/csl-types/csl-types/org/netbeans/modules/csl/types/Bundle_ja.properties
index 52b6c22..8dd892e 100755
--- a/netbeans-l10n-zip/src/ja/ide/csl-types/csl-types/org/netbeans/modules/csl/types/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/csl-types/csl-types/org/netbeans/modules/csl/types/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u5171\u901a\u30b9\u30af\u30ea\u30d7\u30c8\u4f5c\u6210\u8a00\u8a9e\u30bf\u30a4\u30d7
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/Bundle_ja.properties
index 1948f78..1749ff3 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CssResolver=CSS\u30d5\u30a1\u30a4\u30eb
 # {0} - file name
diff --git a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_ja.properties
index 9650ed5..6d7fcd4 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/csl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/csl/Bundle_ja.properties
index 71a9285..4ce92cc 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/csl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/csl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #error checks
diff --git a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/module/main/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/module/main/Bundle_ja.properties
index 2dae6d4..109d107 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/module/main/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/module/main/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 imports=\u30a4\u30f3\u30dd\u30fc\u30c8
 Rules=\u30eb\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_ja.properties
index 3530dc3..c5d4402 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/refactoring/Bundle_ja.properties
index c55294a..208d910 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Rename=\u540d\u524d\u5909\u66f4
 DSC_Rename=<b>{0}</b>\u306e\u540d\u524d\u3092<b>{1}</b>\u306b\u5909\u66f4
diff --git a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/resources/Bundle_ja.properties
index 707ff9b..c3b5eb1 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=CSS\u30d5\u30a1\u30a4\u30eb\u7de8\u96c6\u306e\u30a8\u30c7\u30a3\u30bf\u30fb\u30b5\u30dd\u30fc\u30c8
 text/css=Cascading Style Sheet
diff --git a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/resources/CSS_template_ja.html b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/resources/CSS_template_ja.html
index e3be138..a0f93ab 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/resources/CSS_template_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/resources/CSS_template_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/css-lib/css-lib/org/netbeans/modules/css/lib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-lib/css-lib/org/netbeans/modules/css/lib/Bundle_ja.properties
index d564135..8d4fed9 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-lib/css-lib/org/netbeans/modules/css/lib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-lib/css-lib/org/netbeans/modules/css/lib/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Error_Premature_EOF=\u30d5\u30a1\u30a4\u30eb\u306e\u4e88\u671f\u3057\u306a\u3044\u7d42\u4e86
 # {0} - the unexpected character
diff --git a/netbeans-l10n-zip/src/ja/ide/css-lib/css-lib/org/netbeans/modules/css/lib/nbparser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-lib/css-lib/org/netbeans/modules/css/lib/nbparser/Bundle_ja.properties
index 1c1d1d3..bbcb794 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-lib/css-lib/org/netbeans/modules/css/lib/nbparser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-lib/css-lib/org/netbeans/modules/css/lib/nbparser/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 too.large.snapshot=\u30bd\u30fc\u30b9\u30fb\u30b3\u30fc\u30c9\u306fCSS\u89e3\u6790\u306b\u306f\u5927\u304d\u3059\u304e\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-model/css-model/org/netbeans/modules/css/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-model/css-model/org/netbeans/modules/css/model/Bundle_ja.properties
index de20d6e..723a4f0 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-model/css-model/org/netbeans/modules/css/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-model/css-model/org/netbeans/modules/css/model/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=CSS\u30bd\u30fc\u30b9\u30fb\u30e2\u30c7\u30eb
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Short-Description=CSS\u30bd\u30fc\u30b9\u30fb\u30e2\u30c7\u30eb\u306f\u3001\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30fb\u30e2\u30c7\u30eb\u7d4c\u7531\u3067\u306eCSS\u306e\u8aad\u53d6\u308a\u304a\u3088\u3073\u66f8\u8fbc\u307f\u6a5f\u80fd\u3092\u63d0\u4f9b\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/Bundle_ja.properties
index edc4ff5..fe8a64d 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/Bundle_ja.properties
@@ -1,42 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CssPreprocessorType.less.displayName=LESS
 CssPreprocessorType.sass.displayName=Sass
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=Web
 OpenIDE-Module-Long-Description=CSS\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5\u306e\u30b5\u30dd\u30fc\u30c8 - LESS (.less)\u3068SASS (CSS\u4e92\u63db\u69cb\u6587 - .scss)\u3002
 OpenIDE-Module-Name=CSS\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/Bundle_ja.properties
index 9d460a5..f930c83 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 navigator.item.name.mixins=Mixin
 navigator.item.name.variables=\u5909\u6570
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/less/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/less/Bundle_ja.properties
index 4a8ea80..a19afae 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/less/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/less/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_LESSEditorTab=\u30bd\u30fc\u30b9(&S)
 LessResolver=LESS CSS\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/refactoring/Bundle_ja.properties
index 7a43962..390bae1 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Rename=\u540d\u524d\u5909\u66f4
 DSC_Rename=<b>{0}</b>\u306e\u540d\u524d\u3092<b>{1}</b>\u306b\u5909\u66f4
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/scss/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/scss/Bundle_ja.properties
index bb57efe..b620961 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/scss/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/editor/scss/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_SCSSEditorTab=\u30bd\u30fc\u30b9(&S)
 ScssResolver=SCSS\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/less/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/less/Bundle_ja.properties
index 8172373..292e933 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/less/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/less/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Less.compile=LESS (\u30b3\u30f3\u30d1\u30a4\u30eb)
 Less.executable.label=LESS\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb
 LessCssPreprocessor.displayName=LESS
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/preferences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/preferences/Bundle_ja.properties
index b4fcada..e0ef9e9 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/preferences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/preferences/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - error
 LessPreferencesValidator.error.executable={0}\u300c\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u306e\u69cb\u6210\u300d\u30dc\u30bf\u30f3\u3092\u4f7f\u7528\u3057\u3066\u3053\u308c\u3092\u4fee\u6b63\u3057\u307e\u3059\u3002
 # {0} - error
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/problems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/problems/Bundle_ja.properties
index d0322ee..58b6571 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/problems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/problems/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - preprocessor name
 # {1} - message
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/process/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/process/Bundle_ja.properties
index eb0fce0..3b7cb20 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/process/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/process/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - preprocessor name
 BaseProcessor.error.mappings.empty={0}\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5\u306e\u30de\u30c3\u30d4\u30f3\u30b0\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/sass/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/sass/Bundle_ja.properties
index 8091a88..e7fda8d 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/sass/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/sass/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 SassCli.compile=Sass (\u30b3\u30f3\u30d1\u30a4\u30eb)
 SassCli.executable.label=Sass\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb
 SassCssPreprocessor.displayName=Sass
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/customizer/Bundle_ja.properties
index ed9115c..f4cd0b9 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MappingsTableModel.column.input.title=\u5165\u529b
 MappingsTableModel.column.output.title=\u51fa\u529b
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/options/Bundle_ja.properties
index 8991834..23b377a 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # keywords - XXX how to get tab title properly?
 CssPrepOptionsPanel.name=CSS\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/resources/NewLessFileDescription_ja.html b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/resources/NewLessFileDescription_ja.html
index d90f32a..37b7e4f 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/resources/NewLessFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/resources/NewLessFileDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/resources/NewSassFileDescription_ja.html b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/resources/NewSassFileDescription_ja.html
index 31dd769..58cee06 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/resources/NewSassFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/resources/NewSassFileDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/wizard/Bundle_ja.properties
index 4bbcd69..94270b5 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/ui/wizard/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NewFileWizardIterator.less.template.displayName=LESS\u30d5\u30a1\u30a4\u30eb
 NewFileWizardIterator.scss.template.displayName=Sass\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/util/Bundle_ja.properties
index 3111991..d9f7f18 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-prep/css-prep/org/netbeans/modules/css/prep/util/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - preprocessor name
 CssPreprocessorUtils.fileSaved.question=<html>\u4fdd\u5b58\u6642\u306b\u81ea\u52d5{0}\u30b3\u30f3\u30d1\u30a4\u30eb\u3092\u69cb\u6210\u3057\u307e\u3059\u304b\u3002<br>\u3053\u308c\u306f\u30d7\u30ed\u30d1\u30c6\u30a3\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3\u3067\u3044\u3064\u3067\u3082\u30aa\u30f3(\u307e\u305f\u306f\u30aa\u30d5)\u306b\u3067\u304d\u307e\u3059\u3002
 # {0} - preprocessor name
diff --git a/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/Bundle_ja.properties
index 6c4d5e6..734aaf1 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 action.name.all=\u3059\u3079\u3066\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8868\u793a
 action.name.categorized=\u5206\u985e\u6e08\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/actions/Bundle_ja.properties
index 8ab13f7..eb24c07 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_EditElementRulesEditorAction=CSS\u30eb\u30fc\u30eb\u306e\u7de8\u96c6
 delete.rule.confirmation=\u30eb\u30fc\u30eb{0}\u3092\u30d5\u30a1\u30a4\u30eb{1}\u304b\u3089\u524a\u9664\u3057\u307e\u3059\u304b\u3002
 EditCSSRules=CSS\u30eb\u30fc\u30eb\u306e\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/api/Bundle_ja.properties
index 263e079..cbef908 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_CssStylesAction=CSS\u30b9\u30bf\u30a4\u30eb(&S)
 CTL_CssStylesTC.title={0}CSS\u30b9\u30bf\u30a4\u30eb
 HINT_CssStylesTC=\u3053\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u306f\u3001\u8981\u7d20\u306e\u4e00\u81f4\u3059\u308b\u30b9\u30bf\u30a4\u30eb\u30fb\u30eb\u30fc\u30eb\u304c\u8868\u793a\u3055\u308c\u3001\u305d\u308c\u3089\u3092\u7de8\u96c6\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/resources/Bundle_ja.properties
index 7367a87..2101382 100755
--- a/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/css-visual/css-visual/org/netbeans/modules/css/visual/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Services/MIMEResolver/CssResolver.xml=CSS\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/api/sql/execute/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/api/sql/execute/Bundle_ja.properties
index 4f942ad..cc82a3d 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/api/sql/execute/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/api/sql/execute/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_ErrorDialogTitle=\u30a8\u30e9\u30fc
 # {0} - execution time
 # {1} - total number of errors
diff --git a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/core/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/core/Bundle_ja.properties
index 8d1b05e..5e67f92 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/core/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/core/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30fb\u30b3\u30a2
 OpenIDE-Module-Display-Category=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/core/resources/SQLTemplate_ja.html b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/core/resources/SQLTemplate_ja.html
index 8a69c56..99844a2 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/core/resources/SQLTemplate_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/core/resources/SQLTemplate_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/execute/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/execute/Bundle_ja.properties
index a71c201..394e2e3 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/execute/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/execute/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} = executed statement
 LBL_Executing={0}\u3092\u5b9f\u884c\u4e2d
diff --git a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/execute/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/execute/ui/Bundle_ja.properties
index d58d4d6..5f36ed8 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/execute/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/execute/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # SQLResultPanel
 LBL_FetchYes=\u306f\u3044(&Y)
diff --git a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/history/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/history/Bundle_ja.properties
index a8e54b0..c0cee0e 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/history/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/history/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_SQLHistoryFileError=\u5c65\u6b74\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u53d6\u308a\u3067\u554f\u984c\u304c\u3042\u308a\u307e\u3059\u3002
 SQLHistoryPropertiesPanel.sqlSaveLimitTextField.text=jTextField1
diff --git a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/loader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/loader/Bundle_ja.properties
index abdae5f..60779db 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/loader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-core/db-core/org/netbeans/modules/db/sql/loader/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - error code
 # {1} - error sql state
diff --git a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/Bundle_ja.properties
index 749b650..5662cec 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
 OpenIDE-Module-Long-Description=\u7279\u5b9a\u306e\u554f\u5408\u305b\u6587\u5b57\u5217\u306b\u57fa\u3065\u3044\u305f\u7de8\u96c6\u53ef\u80fd\u306a\u30c7\u30fc\u30bf\u30fb\u30d3\u30e5\u30fc\u30fb\u30d1\u30cd\u30eb\u3092\u8868\u793a\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30c7\u30fc\u30bf\u30fb\u30d3\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle_ja.properties
index 9b6a10e..72b9fe8 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/output/Bundle_ja.properties
@@ -1,35 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_fetched_rows=\u30d5\u30a7\u30c3\u30c1\u3055\u308c\u305f\u884c:
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2012 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-2009 Sun
-# Microsystems, Inc. All Rights Reserved.
-#
 # Sample ResourceBundle properties file
 MSG_LoadData=\u30c7\u30fc\u30bf\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/table/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/table/Bundle_ja.properties
index 7c85e0f..9395470 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/table/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/table/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ResultSetJXTable.columnControl.tooltip=\u5217\u3092\u9078\u629e/\u9078\u629e\u89e3\u9664
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/table/celleditor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/table/celleditor/Bundle_ja.properties
index 3d7387b..6f2afa6 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/table/celleditor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/table/celleditor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 nullLob.title=NULL\u306b\u8a2d\u5b9a
 saveLob.title=\u30d5\u30a1\u30a4\u30eb\u306b\u4fdd\u5b58
diff --git a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/util/Bundle_ja.properties
index 7a63854..3f1a0c3 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-dataview/db-dataview/org/netbeans/modules/db/dataview/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TOOLTIP_column_name=\u540d\u524d
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db-drivers/db-drivers/org/netbeans/modules/db/drivers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-drivers/db-drivers/org/netbeans/modules/db/drivers/Bundle_ja.properties
index 4c15a9d..ee2049e 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-drivers/db-drivers/org/netbeans/modules/db/drivers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-drivers/db-drivers/org/netbeans/modules/db/drivers/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MySQLDriver=MySQL JDBC\u30c9\u30e9\u30a4\u30d0
 OpenIDE-Module-Name=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30fb\u30c9\u30e9\u30a4\u30d0
diff --git a/netbeans-l10n-zip/src/ja/ide/db-kit/db-kit/org/netbeans/modules/db/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-kit/db-kit/org/netbeans/modules/db/kit/Bundle_ja.properties
index 0dfd4c2..66d4158 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-kit/db-kit/org/netbeans/modules/db/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-kit/db-kit/org/netbeans/modules/db/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=\u30d3\u30b8\u30e5\u30a2\u30eb\u304a\u3088\u3073\u30c6\u30ad\u30b9\u30c8\u306eSQL\u30a8\u30c7\u30a3\u30bf\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u306e\u30d6\u30e9\u30a6\u30b6\u3001\u304a\u3088\u3073\u8868\u3068\u305d\u306e\u30c7\u30fc\u30bf\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/ide/db-metadata-model/db-metadata-model/org/netbeans/modules/db/metadata/model/jdbc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-metadata-model/db-metadata-model/org/netbeans/modules/db/metadata/model/jdbc/Bundle_ja.properties
index d1a3c0d..4c9e91a 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-metadata-model/db-metadata-model/org/netbeans/modules/db/metadata/model/jdbc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-metadata-model/db-metadata-model/org/netbeans/modules/db/metadata/model/jdbc/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ERR_CATALOG_NOT_FOUND=\u30ab\u30bf\u30ed\u30b0{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 ERR_SCHEMA_NOT_FOUND=\u30b9\u30ad\u30fc\u30de{0}\u304c\u30ab\u30bf\u30ed\u30b0{1}\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 ERR_COL_NOT_FOUND=\u30ab\u30bf\u30ed\u30b0{0}\u306e\u5217{3}\u3001\u30b9\u30ad\u30fc\u30de{1}\u3001\u8868{2}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/ide/db-metadata-model/db-metadata-model/org/netbeans/modules/db/metadata/model/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-metadata-model/db-metadata-model/org/netbeans/modules/db/metadata/model/resources/Bundle_ja.properties
index 3962472..dcb85a4 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-metadata-model/db-metadata-model/org/netbeans/modules/db/metadata/model/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-metadata-model/db-metadata-model/org/netbeans/modules/db/metadata/model/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
 OpenIDE-Module-Name=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30fb\u30e1\u30bf\u30c7\u30fc\u30bf\u30fb\u30e2\u30c7\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/Bundle_ja.properties
index 4ff3fe3..657b1c9 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306fMySQL\u56fa\u6709\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u6a5f\u80fd\u3092NetBeans\u306b\u63d0\u4f9b\u3057\u307e\u3059\u3002\u3053\u308c\u306b\u306f\u30ed\u30fc\u30ab\u30eb\u30fb\u30b5\u30fc\u30d0\u30fc\u306e\u57fa\u672c\u7684\u306a\u7ba1\u7406\u3068\u3001\u63d0\u4f9b\u3059\u308b\u4fa1\u5024\u304c\u3042\u308b\u3068\u601d\u308f\u308c\u308b\u305d\u306e\u4ed6\u306e\u6a5f\u80fd\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
 OpenIDE-Module-Name=MySQL\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/actions/Bundle_ja.properties
index 05e31ed..bb0b96c 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/actions/Bundle_ja.properties
@@ -1,41 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_FailureConnecting=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9{0}\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093: {1}
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/impl/Bundle_ja.properties
index af9172d..82b0f8e 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/impl/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2009-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009-2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_SampleNotSupported=\u30b5\u30f3\u30d7\u30eb\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093: \u30b5\u30f3\u30d7\u30eb"{0}"\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 MSG_CreatingSampleDBProgressLabel=MySQL\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9{0}\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/installations/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/installations/ui/Bundle_ja.properties
index d2c68ba..0e03257 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/installations/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/installations/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_Detecting_Wait=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3092\u691c\u51fa\u3057\u3066\u3044\u307e\u3059\u3002\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
 MSG_NoInstallationFound=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306f\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f
 selectInstalllation_title=MySQL\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/nodes/Bundle_ja.properties
index 82cb54f..75c5401 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/nodes/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - Database name
 MSG_Confirm_DB_Delete=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9{0}\u3092\u524a\u9664\u3057\u307e\u3059\u304b\u3002
 MSG_Confirm_DB_Delete_Title=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/ui/Bundle_ja.properties
index 8d0965b..ff89e21 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CreateNewDatabasePanel.LBL_CreateDatabaseTitle=MySQL\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u4f5c\u6210
 CreateNewDatabasePanel.ACSD_CreateNewDatabasePanel=MySQL\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u4f5c\u6210
 CreateNewDatabasePanel.MSG_SpecifyDatabase=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u540d\u3092\u9078\u629e\u3059\u308b\u304b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/util/Bundle_ja.properties
index 644d77f..5b04bae 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-mysql/db-mysql/org/netbeans/modules/db/mysql/util/Bundle_ja.properties
@@ -1,41 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_ConnectTimedOut=MySQL\u30b5\u30fc\u30d0\u30fc\u3078\u306e\u63a5\u7d9a\u304c\u30bf\u30a4\u30e0\u30fb\u30a2\u30a6\u30c8\u3057\u307e\u3057\u305f\u3002\u63a5\u7d9a\u8a2d\u5b9a\u304c\u6b63\u3057\u3044\u304b\u3069\u3046\u304b\u3001\u304a\u3088\u3073\u30b5\u30fc\u30d0\u30fc\u304c\u6b63\u3057\u304f\u5b9f\u884c\u3055\u308c\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u3092\u78ba\u8a8d\u3057\u3066\u304b\u3089\u3001\u518d\u63a5\u7d9a\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/Bundle_ja.properties
index 9a36680..1789fe2 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OPTIONS_sql=SQL\u30a8\u30c7\u30a3\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/completion/Bundle_ja.properties
index 3828c32..2848395 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # 0 - the table name.
 MSG_Table=\u8868{0}
diff --git a/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/resources/Bundle_ja.properties
index 086316f..79189d7 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Manifest
 OpenIDE-Module-Name=SQL\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/ui/actions/Bundle_ja.properties
index 79d8268..47e80ee 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-sql-editor/db-sql-editor/org/netbeans/modules/db/sql/editor/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ConnectionAction
 LBL_ConnectionAction=\u63a5\u7d9a(&O):
diff --git a/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/Bundle_ja.properties
index 1d69f58..8c391cd 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/Bundle_ja.properties
@@ -1,45 +1,20 @@
 
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Name=\u30d3\u30b8\u30e5\u30a2\u30eb\u554f\u5408\u305b\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/querybuilder/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/querybuilder/Bundle_ja.properties
index 1849b96..17eee77 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/querybuilder/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/querybuilder/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Window System API
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/ui/Bundle_ja.properties
index c8af4ff..a0b5eea 100755
--- a/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db-sql-visualeditor/db-sql-visualeditor/org/netbeans/modules/db/sql/visualeditor/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/api/db/explorer/node/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/api/db/explorer/node/Bundle_ja.properties
index 4af0f62..9d439dc 100755
--- a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/api/db/explorer/node/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/api/db/explorer/node/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Properties
diff --git a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/api/db/explorer/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/api/db/explorer/support/Bundle_ja.properties
index a2dc5a4..0d295c1 100755
--- a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/api/db/explorer/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/api/db/explorer/support/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_NewDbConnection=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u65b0\u898f\u63a5\u7d9a...
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/Bundle_ja.properties
index 0507e81..8b15579 100755
--- a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} is the database URL, {1} is username, {2} is database schema name
 ConnectionNodeUniqueName={0} [{2}\u306e{1}]
diff --git a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/action/Bundle_ja.properties
index 7322c89..6fb84f7 100755
--- a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/action/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Menu commands
 
 EnableDebug=\u30c7\u30d0\u30c3\u30b0\u3092\u6709\u52b9\u5316
diff --git a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/dlg/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/dlg/Bundle_ja.properties
index 31344ea..3132000 100755
--- a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/dlg/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/dlg/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACS_UniqueA11yDesc=\u4e00\u610f\u3068\u3057\u3066\u7d22\u5f15\u3092\u30de\u30fc\u30af\u3059\u308b\u305f\u3081\u306b\u3053\u306e\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9\u3092\u9078\u629e\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/node/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/node/Bundle_ja.properties
index 43b3ecf..bcd1d0f 100755
--- a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/node/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/explorer/node/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 In=\u30a4\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/resources/Bundle_ja.properties
index 3f1bce5..6c75609 100755
--- a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Manifest
diff --git a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/util/Bundle_ja.properties
index 6301743..fcbd9b4 100755
--- a/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db/db/org/netbeans/modules/db/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_NewDriver=\u65b0\u898f\u30c9\u30e9\u30a4\u30d0...
 
diff --git a/netbeans-l10n-zip/src/ja/ide/db/ext/ddl/org/netbeans/lib/ddl/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/db/ext/ddl/org/netbeans/lib/ddl/resources/Bundle_ja.properties
index f85437e..0d7e8a4 100755
--- a/netbeans-l10n-zip/src/ja/ide/db/ext/ddl/org/netbeans/lib/ddl/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/db/ext/ddl/org/netbeans/lib/ddl/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Output window name
 LBL_Output_Window=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30fb\u30a8\u30af\u30b9\u30d7\u30ed\u30fc\u30e9
diff --git a/netbeans-l10n-zip/src/ja/ide/dbapi/dbapi/org/netbeans/modules/dbapi/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dbapi/dbapi/org/netbeans/modules/dbapi/resources/Bundle_ja.properties
index a7ee5f7..0739706 100755
--- a/netbeans-l10n-zip/src/ja/ide/dbapi/dbapi/org/netbeans/modules/dbapi/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dbapi/dbapi/org/netbeans/modules/dbapi/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9API
 OpenIDE-Module-Display-Category=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/ide/defaults/defaults/org/netbeans/modules/defaults/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/defaults/defaults/org/netbeans/modules/defaults/Bundle_ja.properties
index 4ac1bb0..107a492 100755
--- a/netbeans-l10n-zip/src/ja/ide/defaults/defaults/org/netbeans/modules/defaults/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/defaults/defaults/org/netbeans/modules/defaults/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=IDE\u306e\u30c7\u30d5\u30a9\u30eb\u30c8
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/derby/derby/org/netbeans/modules/derby/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/derby/derby/org/netbeans/modules/derby/Bundle_ja.properties
index 5c69256..d78350a 100755
--- a/netbeans-l10n-zip/src/ja/ide/derby/derby/org/netbeans/modules/derby/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/derby/derby/org/netbeans/modules/derby/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - Database name
 MSG_Confirm_DB_Delete=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9{0}\u3092\u524a\u9664\u3057\u307e\u3059\u304b\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/derby/derby/org/netbeans/modules/derby/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/derby/derby/org/netbeans/modules/derby/ui/Bundle_ja.properties
index 87ac215..1bc9363 100755
--- a/netbeans-l10n-zip/src/ja/ide/derby/derby/org/netbeans/modules/derby/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/derby/derby/org/netbeans/modules/derby/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CreateDatabasePanel
 LBL_DatabaseName=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u540d(&N):
diff --git a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/Bundle_ja.properties
index ecd210e..d0317ef 100755
--- a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Manifest
 
diff --git a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/Bundle_ja.properties
index 57841cd..bc7ac59 100755
--- a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DefaultDiff.displayName=\u7d44\u8fbc\u307f\u306e\u5dee\u5206\u30b5\u30fc\u30d3\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/provider/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/provider/Bundle_ja.properties
index 479602e..252e28d 100755
--- a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/provider/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/provider/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BuiltInDiffProvider.displayName=\u7d44\u8fbc\u307f\u5dee\u5206\u30a8\u30f3\u30b8\u30f3
 BuiltInDiffProvider.shortDescription=2\u3064\u306e\u30bd\u30fc\u30b9\u306e\u5dee\u5206\u3092\u8a08\u7b97\u3059\u308b\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u7d44\u8fbc\u307f\u5dee\u5206\u30a8\u30f3\u30b8\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/visualizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/visualizer/Bundle_ja.properties
index 65ac2f5..0a2e8b5 100755
--- a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/visualizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/visualizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DiffComponent.title=\u5dee\u5206
 DiffComponent.titleFile=\u5dee\u5206: {0}
diff --git a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/visualizer/editable/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/visualizer/editable/Bundle_ja.properties
index 0119709..60fba69 100755
--- a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/visualizer/editable/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/builtin/visualizer/editable/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Diff.dev_null=/dev/null
 DiffComponent.title={0}<-> {1} [\u5dee\u5206]
diff --git a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/cmdline/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/cmdline/Bundle_ja.properties
index 3f07b8e..91627a2 100755
--- a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/cmdline/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/cmdline/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 displayName=\u30b3\u30de\u30f3\u30c9\u884c\u5dee\u5206
 shortDescription=UNIX\u306e\u5dee\u5206\u30b3\u30de\u30f3\u30c9\u3068\u4e92\u63db\u6027\u306e\u3042\u308b\u5f62\u5f0f\u3067\u5dee\u5206\u306e\u30ea\u30b9\u30c8\u3092\u751f\u6210\u3059\u308b\u3001\u5916\u90e8\u5dee\u5206\u30a8\u30f3\u30b8\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/options/Bundle_ja.properties
index 2f140e7..b3e49ca 100755
--- a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/diff/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Diff Options
 # ==============================================================
diff --git a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/merge/builtin/visualizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/merge/builtin/visualizer/Bundle_ja.properties
index 74c6496..5c11c34 100755
--- a/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/merge/builtin/visualizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/diff/diff/org/netbeans/modules/merge/builtin/visualizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # mf-layer.xml
 Services/MergeVisualizers=\u30de\u30fc\u30b8\u8868\u793a\u6a5f\u80fd
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution-nb/dlight-nativeexecution-nb/org/netbeans/modules/nativeexecution/nb/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution-nb/dlight-nativeexecution-nb/org/netbeans/modules/nativeexecution/nb/resources/Bundle_ja.properties
index 752b550..b6b3fa4 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution-nb/dlight-nativeexecution-nb/org/netbeans/modules/nativeexecution/nb/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution-nb/dlight-nativeexecution-nb/org/netbeans/modules/nativeexecution/nb/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30cd\u30a4\u30c6\u30a3\u30d6\u5b9f\u884cUI
 
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution-nb/dlight-nativeexecution-nb/org/netbeans/modules/nativeexecution/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution-nb/dlight-nativeexecution-nb/org/netbeans/modules/nativeexecution/ui/Bundle_ja.properties
index 075cbdb..3934a24 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution-nb/dlight-nativeexecution-nb/org/netbeans/modules/nativeexecution/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution-nb/dlight-nativeexecution-nb/org/netbeans/modules/nativeexecution/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PasswordDlg.jLabel1.text=\u30db\u30b9\u30c8:
 
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/Bundle_ja.properties
index 1100e70..d1d79c5 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TerminalLocalNativeProcess.terminalTitle.text=\u5916\u90e8\u30bf\u30fc\u30df\u30ca\u30eb
 TerminalLocalNativeProcess.ProcessStarted.text=\u30d7\u30ed\u30bb\u30b9\u304c\u5916\u90e8\u30bf\u30fc\u30df\u30ca\u30eb\u3067\u958b\u59cb\u3055\u308c\u307e\u3057\u305f ...
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/Bundle_ja.properties
index 99e1336..5b048fa 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - display name of execution environment
 EXC_NotConnectedQuestion={0}\u3078\u306e\u63a5\u7d9a\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u4eca\u3059\u3050\u63a5\u7d9a\u3057\u307e\u3059\u304b\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/execution/Bundle_ja.properties
index 954949f..faa6e56 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/execution/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # PostMessageDisplayer.Default status-bar messages
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/util/Bundle_ja.properties
index f56e501..9773ee6 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/api/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ConnectionManager.ConnectToAction.text={0}\u306b\u63a5\u7d9a
 ConnectionManager.ConnectionFailed={0}\u3078\u306e\u63a5\u7d9a\u306b\u5931\u6557
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/jsch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/jsch/Bundle_ja.properties
index a0fd538..d866669 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/jsch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/jsch/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ConnectingProgressHandle.Connecting={0}\u306b\u63a5\u7d9a\u3057\u3066\u3044\u307e\u3059...
 
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/resources/Bundle_ja.properties
index a5f309d..83ece66 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30cd\u30a4\u30c6\u30a3\u30d6\u5b9f\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/sps/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/sps/impl/Bundle_ja.properties
index 893b23c..7f79474 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/sps/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/sps/impl/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TaskPrivilegesSupport_Progress_RequestPrivileges=\u5fc5\u8981\u3068\u3055\u308c\u308b\u7279\u6a29\u3092\u30ea\u30af\u30a8\u30b9\u30c8\u4e2d...
 TaskPrivilegesSupport_GrantPrivileges_Failed=\u5fc5\u8981\u306a\u7279\u6a29\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties
index c2a9823..98d6698 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TITLE_YN_Warning=\u8b66\u544a
 
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_ja.properties
index 2955706..8646283 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/hostinfo/impl/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TITLE_PermissionDenied=\u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4f7f\u7528\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 SHORTMSG_PermissionDenied={1}({0})
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_ja.properties
index 5571225..c27e035 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PasswordDlg.jLabel1.text=\u30db\u30b9\u30c8:
 
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/Bundle_ja.properties
index 2c5d013..03fd066 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_SomeAction=ttt
 OpenIDE-Module-Display-Category=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b5\u30dd\u30fc\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Long-Description=\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001\u7d44\u8fbc\u307f\u306e\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30a8\u30df\u30e5\u30ec\u30fc\u30bf\u3092\u3001\u300c\u30a6\u30a3\u30f3\u30c9\u30a6\u300d>\u300c\u51fa\u529b\u300d>\u300c\u30bf\u30fc\u30df\u30ca\u30eb\u300d\u304a\u3088\u3073\u300c\u30a6\u30a3\u30f3\u30c9\u30a6\u300d>\u300c\u51fa\u529b\u300d>\u300c\u30ea\u30e2\u30fc\u30c8\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u300d\u30a2\u30af\u30b7\u30e7\u30f3\u3068\u3057\u3066\u63d0\u4f9b\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/action/Bundle_ja.properties
index cc78409..e80c1fd 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/action/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_LocalTerminal=\u30ed\u30fc\u30ab\u30eb\u30fb\u30bf\u30fc\u30df\u30ca\u30eb
 CTL_RemoteTerminalAction=\u30ea\u30e2\u30fc\u30c8\u30fb\u30bf\u30fc\u30df\u30ca\u30eb
 RemoteConnectionTitle=SSH\u63a5\u7d9a
diff --git a/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/ui/Bundle_ja.properties
index ac61b1b..1c89fa0 100755
--- a/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_TerminalContainerTopComponent=\u30bf\u30fc\u30df\u30ca\u30eb
 HINT_TerminalContainerTopComponent=\u3053\u308c\u306f\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30b3\u30f3\u30c6\u30ca\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3059
 RemoteInfoDialog.jLabel1.text=\u30e6\u30fc\u30b6\u30fc(&U):
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-api/docker-api/org/netbeans/modules/docker/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-api/docker-api/org/netbeans/modules/docker/resources/Bundle_ja.properties
index 5c90e7d..4aa0ffc 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-api/docker-api/org/netbeans/modules/docker/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-api/docker-api/org/netbeans/modules/docker/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Name=Docker API
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/Bundle_ja.properties
index ee4a937..3757206 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/Bundle_ja.properties
@@ -1,45 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Dockerfile=Docker\u30d3\u30eb\u30c9\u30fb\u30d5\u30a1\u30a4\u30eb
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 1997-2016 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.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=Dockerfile\u306e\u30a8\u30c7\u30a3\u30bf\u3092\u63d0\u4f9b\u3057\u307e\u3059
 OpenIDE-Module-Name=Docker\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/resources/Bundle_ja.properties
index 8375aad..dd9d3fe 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Other/Dockerfile=Dockerfile
 
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/resources/Dockerfile_ja.html b/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/resources/Dockerfile_ja.html
index cab2223..17d9e56 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/resources/Dockerfile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/resources/Dockerfile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/util/Bundle_ja.properties
index 221c252..266e416 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-editor/docker-editor/org/netbeans/modules/docker/editor/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_DownloadingDoc=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u4e2d...
 
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/Bundle_ja.properties
index a04dd73..48ebd42 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - error token
 MSG_ErrorContainerCharacter=\u540d\u524d\u306b\u4f7f\u7528\u3067\u304d\u308b\u306e\u306f[a-zA-Z0-9][a-zA-Z0-9_.-]\u306e\u307f\u3067\u3059({0})\u3002
 MSG_ErrorContainerShort=\u540d\u524d\u306e\u9577\u3055\u306f2\u6587\u5b57\u4ee5\u4e0a\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_ja.properties
index 44c7869..64eea41 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/build2/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 BuildContextVisual.buldContextLabel.text=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u30d3\u30eb\u30c9(&C):
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/commit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/commit/Bundle_ja.properties
index 574e6db..f2032fd 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/commit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/commit/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 CommitPanel.pauseCheckBox.text=\u30b3\u30df\u30c3\u30c8\u524d\u306b\u30b3\u30f3\u30c6\u30ca\u3092\u4e00\u6642\u505c\u6b62(&P)
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/credentials/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/credentials/Bundle_ja.properties
index 5c3b138..0684079 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/credentials/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/credentials/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_Close=\u9589\u3058\u308b
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_ja.properties
index 313498f..dbb8be0 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/node/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Docker_Root_Node_Name=Docker
 Docker_Root_Node_Short_Description=IDE\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u308bDocker\u30de\u30b7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/output/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/output/Bundle_ja.properties
index 5eebea2..c6199d0 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/output/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/output/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - container id
 LBL_LogInputOutput=\u30ed\u30b0{0}
 LBL_TerminalOptions=\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/pull/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/pull/Bundle_ja.properties
index f45d339..6a26a3d 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/pull/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/pull/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 DockerHubSearchPanel.searching=\u691c\u7d22\u3057\u3066\u3044\u307e\u3059...
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/rename/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/rename/Bundle_ja.properties
index 9051616..2b6d282 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/rename/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/rename/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_Rename=\u540d\u524d\u5909\u66f4(&R)
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/resources/Bundle_ja.properties
index b20de08..cc2eb9d 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Name=Docker UI
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_ja.properties
index 5d2321e..acc61d1 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/run/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_Add=\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/tag/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/tag/Bundle_ja.properties
index 85f1b7d..e293525 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/tag/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/tag/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_Tag=\u30bf\u30b0(&T)
diff --git a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/wizard/Bundle_ja.properties
index 3368f1f..08a6ea8 100755
--- a/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/docker-ui/docker-ui/org/netbeans/modules/docker/ui/wizard/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_AddDockerInstance=Docker\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-actions/editor-actions/org/netbeans/modules/editor/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-actions/editor-actions/org/netbeans/modules/editor/actions/Bundle_ja.properties
index 667d240..9e6aa81 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-actions/editor-actions/org/netbeans/modules/editor/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-actions/editor-actions/org/netbeans/modules/editor/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30a2\u30af\u30b7\u30e7\u30f3
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/lib/editor/bookmarks/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/lib/editor/bookmarks/actions/Bundle_ja.properties
index 8b4fd6f..0df8ddb 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/lib/editor/bookmarks/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/lib/editor/bookmarks/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 bookmark-next=\u6b21\u306e\u30d6\u30c3\u30af\u30de\u30fc\u30af(&O)
 bookmark-previous=\u524d\u306e\u30d6\u30c3\u30af\u30de\u30fc\u30af(&U)
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/lib/editor/bookmarks/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/lib/editor/bookmarks/api/Bundle_ja.properties
index 41dd27b..c152131 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/lib/editor/bookmarks/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/lib/editor/bookmarks/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - line number
 Bookmark_Tooltip=\u30d6\u30c3\u30af\u30de\u30fc\u30af
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/Bundle_ja.properties
index b178ca2..d3992b1 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30d6\u30c3\u30af\u30de\u30fc\u30af
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/ui/Bundle_ja.properties
index 34ac548..65ba888 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-bookmarks/editor-bookmarks/org/netbeans/modules/editor/bookmarks/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_BookmarksView=\u30d6\u30c3\u30af\u30de\u30fc\u30af
 LBL_BookmarksViewToolTip=\u958b\u304b\u308c\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u306e\u30a8\u30c7\u30a3\u30bf\u30fb\u30d6\u30c3\u30af\u30de\u30fc\u30af
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-bracesmatching/editor-bracesmatching/org/netbeans/modules/editor/bracesmatching/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-bracesmatching/editor-bracesmatching/org/netbeans/modules/editor/bracesmatching/Bundle_ja.properties
index 67d27c0..559d537 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-bracesmatching/editor-bracesmatching/org/netbeans/modules/editor/bracesmatching/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-bracesmatching/editor-bracesmatching/org/netbeans/modules/editor/bracesmatching/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Short-Description=\u4e00\u81f4\u3057\u305f\u4e2d\u62ec\u5f27\u306e\u5f37\u8abf\u8868\u793a\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-breadcrumbs/editor-breadcrumbs/org/netbeans/modules/editor/breadcrumbs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-breadcrumbs/editor-breadcrumbs/org/netbeans/modules/editor/breadcrumbs/Bundle_ja.properties
index c068ed9..25a270c 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-breadcrumbs/editor-breadcrumbs/org/netbeans/modules/editor/breadcrumbs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-breadcrumbs/editor-breadcrumbs/org/netbeans/modules/editor/breadcrumbs/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30d6\u30ec\u30c3\u30c9\u30af\u30e9\u30e0
 toggle-breadcrumbs-view=\u30d6\u30ec\u30c3\u30c9\u30af\u30e9\u30e0\u306e\u8868\u793a(&B)
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/Bundle_ja.properties
index d7b55eb..5663807 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30b3\u30fc\u30c9\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/storage/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/storage/ui/Bundle_ja.properties
index 4c494df..291a590 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/storage/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-codetemplates/editor-codetemplates/org/netbeans/lib/editor/codetemplates/storage/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #CodeTemplates options subcategory
 CTL_CodeTemplates_DisplayName=\u30b3\u30fc\u30c9\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-completion/editor-completion/org/netbeans/modules/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-completion/editor-completion/org/netbeans/modules/editor/completion/Bundle_ja.properties
index ddc7400..21efeb4 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-completion/editor-completion/org/netbeans/modules/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-completion/editor-completion/org/netbeans/modules/editor/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30b3\u30fc\u30c9\u88dc\u5b8c
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-deprecated-pre65formatting/editor-deprecated-pre65formatting/org/netbeans/modules/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-deprecated-pre65formatting/editor-deprecated-pre65formatting/org/netbeans/modules/editor/Bundle_ja.properties
index 90f04c1..b152efb 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-deprecated-pre65formatting/editor-deprecated-pre65formatting/org/netbeans/modules/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-deprecated-pre65formatting/editor-deprecated-pre65formatting/org/netbeans/modules/editor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_NegativeValue=\u8ca0\u306e\u5024\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093
 
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-deprecated-pre65formatting/editor-deprecated-pre65formatting/org/netbeans/modules/editor/deprecated/pre65formatting/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-deprecated-pre65formatting/editor-deprecated-pre65formatting/org/netbeans/modules/editor/deprecated/pre65formatting/Bundle_ja.properties
index a29c459..94545fd 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-deprecated-pre65formatting/editor-deprecated-pre65formatting/org/netbeans/modules/editor/deprecated/pre65formatting/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-deprecated-pre65formatting/editor-deprecated-pre65formatting/org/netbeans/modules/editor/deprecated/pre65formatting/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Name=6.5\u5206\u96e2\u3088\u308a\u524d\u306e\u30a8\u30c7\u30a3\u30bf\u66f8\u5f0f\u8a2d\u5b9a
 
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-document/editor-document/org/netbeans/modules/editor/document/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-document/editor-document/org/netbeans/modules/editor/document/Bundle_ja.properties
index c2aee26..2034df5 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-document/editor-document/org/netbeans/modules/editor/document/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-document/editor-document/org/netbeans/modules/editor/document/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Long-Description=Swing\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u64cd\u4f5cAPI\u304a\u3088\u3073\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u3002
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8API
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-document/editor-document/org/netbeans/modules/editor/lib2/document/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-document/editor-document/org/netbeans/modules/editor/lib2/document/Bundle_ja.properties
index 6f73877..3039c5f 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-document/editor-document/org/netbeans/modules/editor/lib2/document/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-document/editor-document/org/netbeans/modules/editor/lib2/document/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - action name
 AbstractUndoableEdit.undoText.param={0}\u3092\u5143\u306b\u623b\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-errorstripe-api/editor-errorstripe-api/org/netbeans/modules/editor/errorstripe/apimodule/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-errorstripe-api/editor-errorstripe-api/org/netbeans/modules/editor/errorstripe/apimodule/resources/Bundle_ja.properties
index 5fee20b..a372783 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-errorstripe-api/editor-errorstripe-api/org/netbeans/modules/editor/errorstripe/apimodule/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-errorstripe-api/editor-errorstripe-api/org/netbeans/modules/editor/errorstripe/apimodule/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #
 # This bundle defines the localized name of the module, as will be shown
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-errorstripe/editor-errorstripe/org/netbeans/modules/editor/errorstripe/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-errorstripe/editor-errorstripe/org/netbeans/modules/editor/errorstripe/Bundle_ja.properties
index 020331f..0972d3e 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-errorstripe/editor-errorstripe/org/netbeans/modules/editor/errorstripe/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-errorstripe/editor-errorstripe/org/netbeans/modules/editor/errorstripe/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TP_ErrorStripe=\u30a8\u30e9\u30fc\u30fb\u30b9\u30c8\u30e9\u30a4\u30d7
 
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-errorstripe/editor-errorstripe/org/netbeans/modules/editor/errorstripe/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-errorstripe/editor-errorstripe/org/netbeans/modules/editor/errorstripe/resources/Bundle_ja.properties
index 7b71187..f418dcc 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-errorstripe/editor-errorstripe/org/netbeans/modules/editor/errorstripe/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-errorstripe/editor-errorstripe/org/netbeans/modules/editor/errorstripe/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #
 # This bundle defines the localized name of the module, as will be shown
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-fold-nbui/editor-fold-nbui/org/netbeans/modules/editor/fold/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-fold-nbui/editor-fold-nbui/org/netbeans/modules/editor/fold/ui/Bundle_ja.properties
index 944ea99..0cc58bb 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-fold-nbui/editor-fold-nbui/org/netbeans/modules/editor/fold/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-fold-nbui/editor-fold-nbui/org/netbeans/modules/editor/fold/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - number of lines of folded code
 FMT_contentSummary={0} {0,choice,0#\u884c|1#\u884c|1<\u884c}
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-fold/editor-fold/org/netbeans/api/editor/fold/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-fold/editor-fold/org/netbeans/api/editor/fold/Bundle_ja.properties
index 3bac2d0..e44a517 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-fold/editor-fold/org/netbeans/api/editor/fold/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-fold/editor-fold/org/netbeans/api/editor/fold/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-fold/editor-fold/org/netbeans/modules/editor/fold/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-fold/editor-fold/org/netbeans/modules/editor/fold/Bundle_ja.properties
index d642482..5a10aa6 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-fold/editor-fold/org/netbeans/modules/editor/fold/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-fold/editor-fold/org/netbeans/modules/editor/fold/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30b3\u30fc\u30c9\u6298\u308a\u305f\u305f\u307f
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-global-format/editor-global-format/org/netbeans/modules/editor/global/format/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-global-format/editor-global-format/org/netbeans/modules/editor/global/format/Bundle_ja.properties
index d0988dd..0652c53 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-global-format/editor-global-format/org/netbeans/modules/editor/global/format/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-global-format/editor-global-format/org/netbeans/modules/editor/global/format/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BTN_Cancel=\u53d6\u6d88
 BTN_OK=OK
 CAP_Reformat=\u518d\u5e30\u7684\u30d5\u30a9\u30fc\u30de\u30c3\u30c8
@@ -7,42 +24,5 @@
 LBL_FormattingInProgress=\u30d5\u30a9\u30fc\u30de\u30c3\u30c8:
 LBL_FormattingQuestion=\u9078\u629e\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3092\u518d\u5e30\u7684\u306b\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3057\u307e\u3059\u304b\u3002
 LBL_Preparing=\u6e96\u5099\u4e2d...
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30b0\u30ed\u30fc\u30d0\u30eb\u30fb\u30d5\u30a9\u30fc\u30de\u30c3\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-guards/editor-guards/org/netbeans/modules/editor/guards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-guards/editor-guards/org/netbeans/modules/editor/guards/Bundle_ja.properties
index 03c6194..2d9fae0 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-guards/editor-guards/org/netbeans/modules/editor/guards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-guards/editor-guards/org/netbeans/modules/editor/guards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u3067\u4fdd\u8b77\u3055\u308c\u305f\u30bb\u30af\u30b7\u30e7\u30f3
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-indent-project/editor-indent-project/org/netbeans/modules/editor/indent/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-indent-project/editor-indent-project/org/netbeans/modules/editor/indent/project/Bundle_ja.properties
index 5fddf6e..ea418a9 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-indent-project/editor-indent-project/org/netbeans/modules/editor/indent/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-indent-project/editor-indent-project/org/netbeans/modules/editor/indent/project/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a8\u30c7\u30a3\u30bf\u306e\u30a4\u30f3\u30c7\u30f3\u30c8
 
 #FormattingCustomizerPanel
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-indent-support/editor-indent-support/org/netbeans/modules/editor/indent/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-indent-support/editor-indent-support/org/netbeans/modules/editor/indent/support/Bundle_ja.properties
index 74bd16f..0954a32 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-indent-support/editor-indent-support/org/netbeans/modules/editor/indent/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-indent-support/editor-indent-support/org/netbeans/modules/editor/indent/support/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u306f\u3001\u30a4\u30f3\u30c7\u30f3\u30c8SPI\u30b5\u30dd\u30fc\u30c8\u30fb\u30af\u30e9\u30b9\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30a4\u30f3\u30c7\u30f3\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_ja.properties
index 6d7523d..44b446b 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-indent/editor-indent/org/netbeans/modules/editor/indent/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NAME_IndentScriptEngine=NetBeans\u30a4\u30f3\u30c7\u30f3\u30c8
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u306e\u30a4\u30f3\u30c7\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-kit/editor-kit/org/netbeans/modules/editor/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-kit/editor-kit/org/netbeans/modules/editor/kit/Bundle_ja.properties
index 17c6a02..dfec7d5 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-kit/editor-kit/org/netbeans/modules/editor/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-kit/editor-kit/org/netbeans/modules/editor/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=\u3055\u307e\u3056\u307e\u306a\u30bf\u30a4\u30d7\u306e\u30d5\u30a1\u30a4\u30eb(bat\u3001diff\u3001manifest\u3001sh\u3001css\u3001html\u3001images\u3001Java Script\u3001properties\u30d5\u30a1\u30a4\u30eb\u3001xml\u306a\u3069)\u306e\u7de8\u96c6\u30b5\u30dd\u30fc\u30c8\u3092\u3057\u307e\u3059\u3002\u307e\u305f\u3001\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u79fb\u52d5\u3001\u30d6\u30c3\u30af\u30de\u30fc\u30af\u3001\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3001\u30a8\u30e9\u30fc\u30fb\u30b9\u30c8\u30e9\u30a4\u30d7\u306a\u3069\u306e\u3055\u307e\u3056\u307e\u306a\u30a8\u30c7\u30a3\u30bf\u6a5f\u80fd\u3092\u542b\u307f\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30d5\u30a1\u30a4\u30eb\u306e\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/editor/Bundle_ja.properties
index f8bf770..f75c84a 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Editor ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/editor/ext/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/editor/ext/Bundle_ja.properties
index ce4c265..3ea345c 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/editor/ext/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/editor/ext/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ToggleCommentAction_shortDescription=\u30b3\u30e1\u30f3\u30c8\u5207\u66ff\u3048
 
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_ja.properties
index c38df88..066c5ff 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-lib/editor-lib/org/netbeans/modules/editor/lib/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_ja.properties
index 7d8ee41..a0b67dc 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/modules/editor/lib2/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea2
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/spi/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/spi/editor/Bundle_ja.properties
index 14885c9..8acbe38 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/spi/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-lib2/editor-lib2/org/netbeans/spi/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #
 # UI Logging
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-macros/editor-macros/org/netbeans/modules/editor/macros/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-macros/editor-macros/org/netbeans/modules/editor/macros/Bundle_ja.properties
index 874c21e..6d43a19 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-macros/editor-macros/org/netbeans/modules/editor/macros/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-macros/editor-macros/org/netbeans/modules/editor/macros/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u30a8\u30c7\u30a3\u30bf\u30fb\u30de\u30af\u30ed\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002NetBeans\u30a8\u30c7\u30a3\u30bf\u306e\u30de\u30af\u30ed\u306f\u3001\u7de8\u96c6\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3067\u5b9f\u884c\u53ef\u80fd\u306a\u547d\u4ee4\u306e\u30b7\u30fc\u30b1\u30f3\u30b9\u3067\u3059\u3002\u30de\u30af\u30ed\u306f\u3001\u30e6\u30fc\u30b6\u30fc\u304c\u624b\u52d5\u3067\u30a8\u30c7\u30a3\u30bf\u64cd\u4f5c\u3092\u5b9f\u884c\u3059\u308b\u3068\u304d\u306b\u8a18\u9332\u3057\u3001\u3042\u3068\u3067\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u307b\u304b\u306e\u7de8\u96c6\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3067\u518d\u5b9f\u884c\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-macros/editor-macros/org/netbeans/modules/editor/macros/storage/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-macros/editor-macros/org/netbeans/modules/editor/macros/storage/ui/Bundle_ja.properties
index 2705928..6d99f74 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-macros/editor-macros/org/netbeans/modules/editor/macros/storage/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-macros/editor-macros/org/netbeans/modules/editor/macros/storage/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Macros options subcategory
 CTL_Macros_DisplayName=\u30de\u30af\u30ed
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-plain-lib/editor-plain-lib/org/netbeans/lib/editor/plain/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-plain-lib/editor-plain-lib/org/netbeans/lib/editor/plain/Bundle_ja.properties
index f3dcafb..3ae5525 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-plain-lib/editor-plain-lib/org/netbeans/lib/editor/plain/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-plain-lib/editor-plain-lib/org/netbeans/lib/editor/plain/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d7\u30ec\u30fc\u30f3\u30fb\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-plain/editor-plain/org/netbeans/modules/editor/plain/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-plain/editor-plain/org/netbeans/modules/editor/plain/Bundle_ja.properties
index 866ec4e..bf27a18 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-plain/editor-plain/org/netbeans/modules/editor/plain/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-plain/editor-plain/org/netbeans/modules/editor/plain/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d7\u30ec\u30fc\u30f3\u30fb\u30a8\u30c7\u30a3\u30bf
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-plain/editor-plain/org/netbeans/modules/editor/plain/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-plain/editor-plain/org/netbeans/modules/editor/plain/resources/Bundle_ja.properties
index 928e41e..ca1e1a6 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-plain/editor-plain/org/netbeans/modules/editor/plain/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-plain/editor-plain/org/netbeans/modules/editor/plain/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 text/plain=\u30d7\u30ec\u30fc\u30f3\u30fb\u30c6\u30ad\u30b9\u30c8
 default=\u30c7\u30d5\u30a9\u30eb\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-search/editor-search/org/netbeans/modules/editor/search/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-search/editor-search/org/netbeans/modules/editor/search/Bundle_ja.properties
index 3298b76..40e0ed3 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-search/editor-search/org/netbeans/modules/editor/search/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-search/editor-search/org/netbeans/modules/editor/search/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u691c\u7d22
 
 # SearchBar and actions
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-search/editor-search/org/netbeans/modules/editor/search/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-search/editor-search/org/netbeans/modules/editor/search/actions/Bundle_ja.properties
index 59e0c61..542ecbc 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-search/editor-search/org/netbeans/modules/editor/search/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-search/editor-search/org/netbeans/modules/editor/search/actions/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 replace=\u7f6e\u63db
 replace_menu_text=\u7f6e\u63db(&E)...
 find=\u691c\u7d22
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-settings-lib/editor-settings-lib/org/netbeans/modules/editor/settings/lib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-settings-lib/editor-settings-lib/org/netbeans/modules/editor/settings/lib/Bundle_ja.properties
index 15dcfb8..6dac8e7 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-settings-lib/editor-settings-lib/org/netbeans/modules/editor/settings/lib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-settings-lib/editor-settings-lib/org/netbeans/modules/editor/settings/lib/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u8a2d\u5b9a\u30e9\u30a4\u30d6\u30e9\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-settings-lib/editor-settings-lib/org/netbeans/modules/editor/settings/storage/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-settings-lib/editor-settings-lib/org/netbeans/modules/editor/settings/storage/Bundle_ja.properties
index b2876fb..0093990 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-settings-lib/editor-settings-lib/org/netbeans/modules/editor/settings/storage/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-settings-lib/editor-settings-lib/org/netbeans/modules/editor/settings/storage/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # MIMEResolver
 EditorResolver=NetBeans\u30a8\u30c7\u30a3\u30bf\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-settings-storage/editor-settings-storage/org/netbeans/modules/editor/settings/storage/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-settings-storage/editor-settings-storage/org/netbeans/modules/editor/settings/storage/Bundle_ja.properties
index 41f882b..dfcd0c7 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-settings-storage/editor-settings-storage/org/netbeans/modules/editor/settings/storage/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-settings-storage/editor-settings-storage/org/netbeans/modules/editor/settings/storage/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u8a2d\u5b9a\u8a18\u61b6\u57df
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-settings/editor-settings/org/netbeans/modules/editor/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-settings/editor-settings/org/netbeans/modules/editor/settings/Bundle_ja.properties
index e151cc3..6a4744e 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-settings/editor-settings/org/netbeans/modules/editor/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-settings/editor-settings/org/netbeans/modules/editor/settings/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u8a2d\u5b9a
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-structure/editor-structure/org/netbeans/modules/editor/structure/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-structure/editor-structure/org/netbeans/modules/editor/structure/Bundle_ja.properties
index c91e226..d1af373 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-structure/editor-structure/org/netbeans/modules/editor/structure/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-structure/editor-structure/org/netbeans/modules/editor/structure/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30bf\u30b0\u5bfe\u5fdc\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-tools-storage/editor-tools-storage/org/netbeans/modules/editor/tools/storage/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-tools-storage/editor-tools-storage/org/netbeans/modules/editor/tools/storage/Bundle_ja.properties
index 2169196..d51e7b2 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-tools-storage/editor-tools-storage/org/netbeans/modules/editor/tools/storage/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-tools-storage/editor-tools-storage/org/netbeans/modules/editor/tools/storage/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30c4\u30fc\u30eb\u8a18\u61b6\u57df
 
diff --git a/netbeans-l10n-zip/src/ja/ide/editor-util/editor-util/org/netbeans/lib/editor/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor-util/editor-util/org/netbeans/lib/editor/util/Bundle_ja.properties
index b57749d..6146ae1 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor-util/editor-util/org/netbeans/lib/editor/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor-util/editor-util/org/netbeans/lib/editor/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/Bundle_ja.properties
index 2f021f8..9fee057 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/codegen/Bundle_ja.properties
index 2767c5e..a551fd4 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/codegen/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 generate-code-trimmed=\u30b3\u30fc\u30c9\u3092\u633f\u5165
 desc-generate-code=\u30b3\u30fc\u30c9\u3092\u633f\u5165
diff --git a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/impl/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/impl/actions/Bundle_ja.properties
index c62a22d..0a22804 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/impl/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/impl/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 NavigationHistoryBackAction_Tooltip={0}\u306b\u623b\u308b
diff --git a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/impl/actions/clipboardhistory/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/impl/actions/clipboardhistory/Bundle_ja.properties
index c9c58c0..ed079fe 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/impl/actions/clipboardhistory/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/impl/actions/clipboardhistory/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 clipboard-history-oom=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306e\u5c65\u6b74\u304b\u3089\u30e1\u30e2\u30ea\u30fc\u4e0d\u8db3\u306e\u4f8b\u5916\u304c\u30b9\u30ed\u30fc\u3055\u308c\u307e\u3057\u305f
 clipboard-history-oom-details=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u5927\u91cf\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u30b3\u30d4\u30fc\u3055\u308c\u307e\u3057\u305f\u3002Netbeans\u306f\u3001\u3053\u306e\u30c7\u30fc\u30bf\u3092\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306e\u5c65\u6b74\u306b\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002Netbeans\u304c\u4e0d\u5b89\u5b9a\u306b\u306a\u308b\u53ef\u80fd\u6027\u304c\u3042\u308b\u305f\u3081\u3001Netbeans\u306e\u518d\u8d77\u52d5\u3092\u304a\u85a6\u3081\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/resources/override/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/resources/override/Bundle_ja.properties
index a53a9fe..4d1a53c 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/resources/override/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/resources/override/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LAB_IsOverridenAnnotation-override-is-overridden-combined=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3057\u3066\u3044\u308b\u3001\u304b\u3064\u3001\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3055\u308c\u3066\u3044\u308b
 TP_COMBINED-override-is-overridden-combined=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3057\u3066\u3044\u308b\u3001\u304b\u3064\u3001\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3055\u308c\u3066\u3044\u308b
 LAB_IsOverridenAnnotation-implements-is-overridden-combined=\u5b9f\u88c5\u3057\u3066\u3044\u308b\u3001\u304b\u3064\u3001\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3055\u308c\u3066\u3044\u308b
diff --git a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/url/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/url/Bundle_ja.properties
index baa08b4..36570d9 100755
--- a/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/url/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/editor/editor/org/netbeans/modules/editor/url/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2008-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 url=URL
 #{0}: error message from MalformedURLException:
 WARN_Invalid_URL=\u7121\u52b9\u306aURL ({0})
diff --git a/netbeans-l10n-zip/src/ja/ide/extbrowser/extbrowser/org/netbeans/modules/extbrowser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extbrowser/extbrowser/org/netbeans/modules/extbrowser/Bundle_ja.properties
index 61a2a2b..d7a13f7 100755
--- a/netbeans-l10n-zip/src/ja/ide/extbrowser/extbrowser/org/netbeans/modules/extbrowser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extbrowser/extbrowser/org/netbeans/modules/extbrowser/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BrowserUtils.cannot.run.detail=\u9078\u629e\u3055\u308c\u305f\u30d6\u30e9\u30a6\u30b6\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002
 # {0} - browser name
diff --git a/netbeans-l10n-zip/src/ja/ide/extexecution-base/extexecution-base/org/netbeans/api/extexecution/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extexecution-base/extexecution-base/org/netbeans/api/extexecution/base/Bundle_ja.properties
index f3dc10e..7a1a64f 100755
--- a/netbeans-l10n-zip/src/ja/ide/extexecution-base/extexecution-base/org/netbeans/api/extexecution/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extexecution-base/extexecution-base/org/netbeans/api/extexecution/base/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LocalProcessBuilder=\u30d3\u30eb\u30c0\u30fc\u306b\u3088\u308a\u30ed\u30fc\u30ab\u30eb\u30fb\u30d7\u30ed\u30bb\u30b9\u3092\u4f5c\u6210\u4e2d
 
diff --git a/netbeans-l10n-zip/src/ja/ide/extexecution-base/extexecution-base/org/netbeans/modules/extexecution/base/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extexecution-base/extexecution-base/org/netbeans/modules/extexecution/base/resources/Bundle_ja.properties
index b1d5bfa..7cb60da 100755
--- a/netbeans-l10n-zip/src/ja/ide/extexecution-base/extexecution-base/org/netbeans/modules/extexecution/base/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extexecution-base/extexecution-base/org/netbeans/modules/extexecution/base/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u5916\u90e8\u5b9f\u884c\u30d9\u30fc\u30b9API
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
diff --git a/netbeans-l10n-zip/src/ja/ide/extexecution-impl/extexecution-impl/org/netbeans/modules/extexecution/impl/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extexecution-impl/extexecution-impl/org/netbeans/modules/extexecution/impl/resources/Bundle_ja.properties
index e23170a..a3f412f 100755
--- a/netbeans-l10n-zip/src/ja/ide/extexecution-impl/extexecution-impl/org/netbeans/modules/extexecution/impl/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extexecution-impl/extexecution-impl/org/netbeans/modules/extexecution/impl/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u5916\u90e8\u5b9f\u884c\u306e\u5b9f\u88c5
 
diff --git a/netbeans-l10n-zip/src/ja/ide/extexecution-process-jdk9/extexecution-process-jdk9/org/netbeans/modules/extexecution/process/jdk9/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extexecution-process-jdk9/extexecution-process-jdk9/org/netbeans/modules/extexecution/process/jdk9/resources/Bundle_ja.properties
index 9263a3b..16a648c 100755
--- a/netbeans-l10n-zip/src/ja/ide/extexecution-process-jdk9/extexecution-process-jdk9/org/netbeans/modules/extexecution/process/jdk9/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extexecution-process-jdk9/extexecution-process-jdk9/org/netbeans/modules/extexecution/process/jdk9/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u5916\u90e8\u5b9f\u884c\u30d7\u30ed\u30bb\u30b9JDK 9
 
diff --git a/netbeans-l10n-zip/src/ja/ide/extexecution-process/extexecution-process/org/netbeans/modules/extexecution/process/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extexecution-process/extexecution-process/org/netbeans/modules/extexecution/process/resources/Bundle_ja.properties
index cdb88dc..2943d10 100755
--- a/netbeans-l10n-zip/src/ja/ide/extexecution-process/extexecution-process/org/netbeans/modules/extexecution/process/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extexecution-process/extexecution-process/org/netbeans/modules/extexecution/process/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u5916\u90e8\u5b9f\u884c\u30d7\u30ed\u30bb\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/api/extexecution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/api/extexecution/Bundle_ja.properties
index 460b550..b9d49b9 100755
--- a/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/api/extexecution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/api/extexecution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Running=\u5b9f\u884c\u4e2d
 LocalProcessBuilder=\u30d3\u30eb\u30c0\u30fc\u306b\u3088\u308a\u30ed\u30fc\u30ab\u30eb\u30fb\u30d7\u30ed\u30bb\u30b9\u3092\u4f5c\u6210\u4e2d
diff --git a/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/api/extexecution/startup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/api/extexecution/startup/Bundle_ja.properties
index fed7233..600bf3f 100755
--- a/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/api/extexecution/startup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/api/extexecution/startup/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 StartMode_Debug=\u30c7\u30d0\u30c3\u30b0
 StartMode_Normal=\u666e\u901a
 StartMode_Profile=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/modules/extexecution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/modules/extexecution/Bundle_ja.properties
index 55e6a0e..80fd555 100755
--- a/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/modules/extexecution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/modules/extexecution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Stop=\u505c\u6b62
 Rerun=\u518d\u5b9f\u884c
diff --git a/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/modules/extexecution/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/modules/extexecution/resources/Bundle_ja.properties
index acdd9b7..17ace5f 100755
--- a/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/modules/extexecution/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/extexecution/extexecution/org/netbeans/modules/extexecution/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u5916\u90e8\u5b9f\u884cAPI
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/Bundle_ja.properties
index eb73c14..eb44911 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Annotator.variable.branch=\u73fe\u884c\u5206\u5c90\u30e9\u30d9\u30eb\u3092\u8868\u3059
 Annotator.variable.repositoryState=\u30ea\u30dd\u30b8\u30c8\u30ea\u72b6\u614b\u3092\u8868\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/client/Bundle_ja.properties
index 201db82..480af25 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/client/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Queued={0} - \u30ad\u30e5\u30fc
 
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/options/Bundle_ja.properties
index b6dc5f0..b34e0f5 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 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]"
-
-# 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.
-
-# Contributor(s):
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AnnotationColorsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
 CTL_OptionsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/actions/Bundle_ja.properties
index a684d1b..7860192 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_AddAllAction_Name=\u3059\u3079\u3066\u8ffd\u52a0 - \u30ea\u30dd\u30b8\u30c8\u30ea
 LBL_Progress.RefreshingStatuses=\u30d5\u30a1\u30a4\u30eb\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/blame/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/blame/Bundle_ja.properties
index ceb3c1c..787b89c 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/blame/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/blame/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - commit id
 CTL_AnnotationBar.action.showCommit=\u30b3\u30df\u30c3\u30c8{0}\u306e\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/branch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/branch/Bundle_ja.properties
index a041b84..7be729e 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/branch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/branch/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BranchSelector.okButton.text=OK(&O)
 BranchSelector.title=\u5206\u5c90\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/checkout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/checkout/Bundle_ja.properties
index ca5d5dd..9213cd3 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/checkout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/checkout/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CheckoutPathsAction_Name=\u30d5\u30a1\u30a4\u30eb\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&F)...
 LBL_CheckoutPathsAction_PopupName=\u30d5\u30a1\u30a4\u30eb\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8...
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/clone/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/clone/Bundle_ja.properties
index 326212e..66ceef9 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/clone/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/clone/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CloneDestinationStep.branch.noBranch=\u5206\u5c90\u306a\u3057
 LBL_Clone.confirmSubmoduleInit.title=\u30b5\u30d6\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u521d\u671f\u5316
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/commit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/commit/Bundle_ja.properties
index ddd0248..5f0e392 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/commit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/commit/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - counted context
 # {1} - current branch
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/conflicts/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/conflicts/Bundle_ja.properties
index 909692b..4ca4c04 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/conflicts/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/conflicts/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #MarkResolvedAction
 LBL_MarkResolvedAction_Name=\u89e3\u6c7a\u3068\u30de\u30fc\u30af(&M)
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/diff/Bundle_ja.properties
index 245f47b..43acc96 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/diff/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## DiffTopComponent.java
 ACSN_Diff_Top_Component=\u5dee\u5206
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/fetch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/fetch/Bundle_ja.properties
index 5cc087c..0ec441a 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/fetch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/fetch/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_PullAction_mergeButton_text=\u30de\u30fc\u30b8(&M)
 CTL_PullAction_mergeButton_TTtext=\u4f5c\u6210\u3055\u308c\u305f2\u3064\u306e\u30d8\u30c3\u30c9\u3092\u30de\u30fc\u30b8\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/history/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/history/Bundle_ja.properties
index c2549b6..739914b 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/history/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/history/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_SearchIncomingT_Top_Component=\u7740\u4fe1\u306e\u691c\u7d22
 ACSD_SearchOutgoingT_Top_Component=\u7740\u4fe1\u306e\u691c\u7d22
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/ignore/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/ignore/Bundle_ja.properties
index e8a29fe..d0888f9 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/ignore/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/ignore/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_IgnoreAction_Name=\u7121\u8996(&I)
 LBL_IgnoreAction_PopupName=\u7121\u8996
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/init/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/init/Bundle_ja.properties
index e40ef20..2f9d4ab 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/init/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/init/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_InitAction.popupName=Git\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u521d\u671f\u5316(&G)...
 LBL_InitAction_Name=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u521d\u671f\u5316(&N)...
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/menu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/menu/Bundle_ja.properties
index 928d41b..fa931f3 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/menu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/menu/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_MenuItem_BranchMenu=\u5206\u5c90/\u30bf\u30b0(&B)
 CTL_MenuItem_BranchMenu.popup=\u5206\u5c90/\u30bf\u30b0
 CTL_MenuItem_CheckoutMenu=\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8(&K)
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/merge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/merge/Bundle_ja.properties
index 6c3e085..3935803 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/merge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/merge/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Merge.failed.title=\u30de\u30fc\u30b8\u3067\u304d\u307e\u305b\u3093
 LBL_MergeRevisionAction_Name=\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u30de\u30fc\u30b8(&M)...
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/output/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/output/Bundle_ja.properties
index 1f508e2..14cb926 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/output/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/output/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_OpenOutputAction_Name=\u51fa\u529b\u3092\u958b\u304f(&O)
 
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/push/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/push/Bundle_ja.properties
index c5c9a79..33a1f58 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/push/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/push/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_PushAction.report.outputButton.desc=\u8a73\u7d30\u3092\u542b\u3080\u51fa\u529b\u3092\u958b\u304d\u307e\u3059
 CTL_PushAction.report.outputButton.text=\u51fa\u529b\u3092\u958b\u304f(&O)
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/rebase/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/rebase/Bundle_ja.properties
index d543609..ee10ba4 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/rebase/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/rebase/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_RebaseAction.abortButton.text=\u4e2d\u65ad(&R)
 CTL_RebaseAction.abortButton.TTtext=\u5272\u8fbc\u307f\u3055\u308c\u305f\u30ea\u30d9\u30fc\u30b9\u3092\u4e2d\u65ad
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/repository/Bundle_ja.properties
index 72bf5fe..be42d29 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/repository/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CloseRepositoryAction.name=\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u9589\u3058\u308b
 CTL_OpenRepository_ACSD=\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30d6\u30e9\u30a6\u30b6\u3067\u958b\u304fGit\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u9078\u629e\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/repository/remote/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/repository/remote/Bundle_ja.properties
index f8d8a03..4b975b3 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/repository/remote/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/repository/remote/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #RemoveRemoteConfigAction
 LBL_RemoveRemoteConfig.progressName=\u30ea\u30e2\u30fc\u30c8\u69cb\u6210\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/reset/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/reset/Bundle_ja.properties
index 4041ec3..0ac0519 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/reset/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/reset/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ResetAction_Name=\u30ea\u30bb\u30c3\u30c8(&S)...
 LBL_ResetAction_PopupName=\u30ea\u30bb\u30c3\u30c8...
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/revert/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/revert/Bundle_ja.properties
index 57b7b68..f867910 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/revert/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/revert/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_RevertCommitAction_Name=\u30b3\u30df\u30c3\u30c8\u3092\u5143\u306b\u623b\u3059(&V)...
 LBL_RevertCommitAction_PopupName=\u30b3\u30df\u30c3\u30c8\u3092\u5143\u306b\u623b\u3059...
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/selectors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/selectors/Bundle_ja.properties
index 9ee3f2f..ed9dcad 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/selectors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/selectors/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2011 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ItemsPanel.titleLabel.toolTipText=\u4f7f\u7528\u53ef\u80fd\u306a\u30ea\u30e2\u30fc\u30c8\u5206\u5c90
 
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/shelve/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/shelve/Bundle_ja.properties
index 99e6469..e5db400 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/shelve/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/shelve/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_ShelveChanges_Title=\u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6(&S)...
 # {0} - stash index
 # {1} - stash name
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/stash/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/stash/Bundle_ja.properties
index 775c4bd..3f9af43 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/stash/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/stash/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ACSD_SaveStash_Message=\u6700\u7d42\u9000\u907f\u30b3\u30df\u30c3\u30c8\u306e\u30b3\u30df\u30c3\u30c8\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u4e00\u90e8\u3068\u3057\u3066\u4f7f\u7528\u3059\u308b\u9000\u907f\u30e1\u30c3\u30bb\u30fc\u30b8\u3002
 ACSN_SaveStash_Message=\u9000\u907f\u30e1\u30c3\u30bb\u30fc\u30b8
 CTL_SaveStash.okButton.text=\u5909\u66f4\u306e\u9000\u907f(&S)
@@ -19,43 +36,6 @@
 MSG_SaveStash.shelveMessage=git\u306e\u9000\u907f\u3092\u4f7f\u7528\u3059\u308b\u304b\u308f\u308a\u306b\u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6\u3067\u304d\u307e\u3059\u3002
 MSG_SaveStashAction.noModifications=\u9000\u907f\u3059\u308b\u3001\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 MSG_SaveStashAction.progressName=\u30ed\u30fc\u30ab\u30eb\u5909\u66f4\u3092\u9000\u907f\u3057\u3066\u3044\u307e\u3059
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 SaveStashPanel.lblMessage.text=\u9000\u907f\u30e1\u30c3\u30bb\u30fc\u30b8(&M):
 SaveStashPanel.cbIncludeUncommitted.text=\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u3092\u542b\u3081\u308b(&I)
 SaveStashPanel.cbIncludeUncommitted.TTtext=\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u3082\u9000\u907f\u3057\u3001\u4f5c\u696d\u30c4\u30ea\u30fc\u304b\u3089\u524a\u9664\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/status/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/status/Bundle_ja.properties
index 4bc36a9..95c7e61 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/status/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/status/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_GitStatusTable.popup.initializing=\u521d\u671f\u5316\u3057\u3066\u3044\u307e\u3059...
 CTL_MenuItem_OpenStatusAction=\u30b9\u30c6\u30fc\u30bf\u30b9\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u958b\u304f
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/tag/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/tag/Bundle_ja.properties
index 1588bca..8562e54 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/tag/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/ui/tag/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CreateTagAction_Name=\u30bf\u30b0\u3092\u4f5c\u6210(&T)...
 LBL_CreateTagAction_PopupName=\u30bf\u30b0\u3092\u4f5c\u6210...
diff --git a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/utils/Bundle_ja.properties
index 67789b8..fe283eb 100755
--- a/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/git/git/org/netbeans/modules/git/utils/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FileSelector.jLabel1.text=\u9078\u629e\u5185\u5bb9\u306f\u8907\u6570\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u5bfe\u8c61\u3067\u3059\u3002\u4f7f\u7528\u3059\u308b\u30d5\u30a9\u30eb\u30c0\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044:
 LBL_FileSelector_Title=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/ide/gototest/gototest/org/netbeans/modules/gototest/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/gototest/gototest/org/netbeans/modules/gototest/Bundle_ja.properties
index d552488..e6e01c0 100755
--- a/netbeans-l10n-zip/src/ja/ide/gototest/gototest/org/netbeans/modules/gototest/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/gototest/gototest/org/netbeans/modules/gototest/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Actions/UnitTests=\u5358\u4f53\u30c6\u30b9\u30c8
 # XXX Is this changed to NAvigate now?
diff --git a/netbeans-l10n-zip/src/ja/ide/gototest/gototest/org/netbeans/modules/gototest/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/gototest/gototest/org/netbeans/modules/gototest/resources/Bundle_ja.properties
index 81e2b85..9acc5e6 100755
--- a/netbeans-l10n-zip/src/ja/ide/gototest/gototest/org/netbeans/modules/gototest/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/gototest/gototest/org/netbeans/modules/gototest/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30c6\u30b9\u30c8\u306b\u79fb\u52d5
 OpenIDE-Module-Display-Category=\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/gsf-codecoverage/gsf-codecoverage/org/netbeans/modules/gsf/codecoverage/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/gsf-codecoverage/gsf-codecoverage/org/netbeans/modules/gsf/codecoverage/Bundle_ja.properties
index 957c957..165fb68 100755
--- a/netbeans-l10n-zip/src/ja/ide/gsf-codecoverage/gsf-codecoverage/org/netbeans/modules/gsf/codecoverage/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/gsf-codecoverage/gsf-codecoverage/org/netbeans/modules/gsf/codecoverage/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Python
 OpenIDE-Module-Name=\u30b3\u30fc\u30c9\u30fb\u30ab\u30d0\u30ec\u30fc\u30b8\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Short-Description=\u30b3\u30fc\u30c9\u30fb\u30ab\u30d0\u30ec\u30fc\u30b8\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/gsf-testrunner-ui/gsf-testrunner-ui/org/netbeans/modules/gsf/testrunner/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/gsf-testrunner-ui/gsf-testrunner-ui/org/netbeans/modules/gsf/testrunner/ui/Bundle_ja.properties
index 2153f1c..18a5776 100755
--- a/netbeans-l10n-zip/src/ja/ide/gsf-testrunner-ui/gsf-testrunner-ui/org/netbeans/modules/gsf/testrunner/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/gsf-testrunner-ui/gsf-testrunner-ui/org/netbeans/modules/gsf/testrunner/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ACSD_ResultPanelTree=\u30c6\u30b9\u30c8\u306e\u6210\u529f\u3001\u5931\u6557\u3001\u30a8\u30e9\u30fc\u306b\u95a2\u3059\u308b\u60c5\u5831\u3092\u30c4\u30ea\u30fc\u69cb\u9020\u3067\u8868\u793a\u3057\u307e\u3059
 ACSD_TestResults=\u6210\u529f\u304a\u3088\u3073\u5931\u6557\u3057\u305f\u30c6\u30b9\u30c8\u306b\u95a2\u3059\u308b\u60c5\u5831\u3068\u3001\u305d\u308c\u3089\u306e\u30c6\u30b9\u30c8\u304b\u3089\u751f\u6210\u3055\u308c\u305f\u51fa\u529b\u3092\u8868\u793a\u3057\u307e\u3059
 ACSN_HorizontalScrollbar=\u7d50\u679c\u30d1\u30cd\u30eb\u306e\u6c34\u5e73\u30b9\u30af\u30ed\u30fc\u30eb\u30fb\u30d0\u30fc
@@ -110,43 +127,6 @@
 MultiviewPanel_rerunButton_tooltip=\u518d\u5b9f\u884c
 MultiviewPanel_rerunFailedButton_tooltip=\u5931\u6557\u3057\u305f\u3082\u306e\u3092\u518d\u5b9f\u884c
 No_Provider_Found=\u30c6\u30b9\u30c8\u30fb\u30e1\u30bd\u30c3\u30c9\u3092\u51e6\u7406\u3067\u304d\u308b\u30d7\u30ed\u30d0\u30a4\u30c0\u304c\u3042\u308a\u307e\u305b\u3093
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=\u5171\u901a\u30c6\u30b9\u30c8\u30fb\u30e9\u30f3\u30ca\u30fcUI
 ResultWindowOpenAction.MenuName=\u30c6\u30b9\u30c8\u7d50\u679c(&T)
 Scanning_In_Progress=\u30b9\u30ad\u30e3\u30f3\u304c\u9032\u884c\u4e2d\u3067\u3059\u3002\u307e\u3060\u30c6\u30b9\u30c8\u30fb\u30e1\u30bd\u30c3\u30c9\u306e\u540d\u524d\u3092\u8b58\u5225\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/ide/gsf-testrunner-ui/gsf-testrunner-ui/org/netbeans/modules/gsf/testrunner/ui/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/gsf-testrunner-ui/gsf-testrunner-ui/org/netbeans/modules/gsf/testrunner/ui/api/Bundle_ja.properties
index f464b59..22cfd59 100755
--- a/netbeans-l10n-zip/src/ja/ide/gsf-testrunner-ui/gsf-testrunner-ui/org/netbeans/modules/gsf/testrunner/ui/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/gsf-testrunner-ui/gsf-testrunner-ui/org/netbeans/modules/gsf/testrunner/ui/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Actual=\u5b9f\u969b
 LBL_CopyStackTrace=\u30b9\u30bf\u30c3\u30af\u30fb\u30c8\u30ec\u30fc\u30b9\u3092\u30b3\u30d4\u30fc(&C)
 LBL_Diff=\u5dee\u5206
diff --git a/netbeans-l10n-zip/src/ja/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/Bundle_ja.properties
index ce0508d..a5822a2 100755
--- a/netbeans-l10n-zip/src/ja/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u5171\u901a\u30c6\u30b9\u30c8\u30fb\u30e9\u30f3\u30ca\u30fcAPI
 OpenIDE-Module-Short-Description=\u30c6\u30b9\u30c8\u7d50\u679c\u30a6\u30a3\u30f3\u30c9\u30a6\u7528\u306e\u5171\u901aAPI\u3092\u63d0\u4f9b
 
diff --git a/netbeans-l10n-zip/src/ja/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/api/Bundle_ja.properties
index 1785b27..8bc1e81 100755
--- a/netbeans-l10n-zip/src/ja/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/gsf-testrunner/gsf-testrunner/org/netbeans/modules/gsf/testrunner/api/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=GSF\u30c6\u30b9\u30c8\u30fb\u30e9\u30f3\u30ca\u30fc
 ACSN_FilterButton=\u30d5\u30a3\u30eb\u30bf\u3092\u30aa\u30f3/\u30aa\u30d5
 ACSN_OutputTextPane=\u30c6\u30b9\u30c8\u51fa\u529b
diff --git a/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/Bundle_ja.properties
index a6e183e..befb45c 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 doc.building=AngularJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 # {0} - the documentation URL
 doc.cannotGet="{0}"\u304b\u3089AngularJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/model/Bundle_ja.properties
index 7607cf9..f69c386 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/model/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Angular=AngularJS
 LBL_DocumentationDownload=AngularJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 
diff --git a/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/resources/Bundle_ja.properties
index 72805f7..b2c4fe5 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-angular/html-angular/org/netbeans/modules/html/angular/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 mod-constructor=HTML\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u30fb\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6
 
diff --git a/netbeans-l10n-zip/src/ja/ide/html-custom/html-custom/org/netbeans/modules/html/custom/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-custom/html-custom/org/netbeans/modules/html/custom/Bundle_ja.properties
index db31f25..95a91ba 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-custom/html-custom/org/netbeans/modules/html/custom/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-custom/html-custom/org/netbeans/modules/html/custom/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=HTML5
 OpenIDE-Module-Long-Description=\u30ab\u30b9\u30bf\u30e0HTML\u62e1\u5f35\u3092HTML\u30a8\u30c7\u30a3\u30bf\u306b\u7d71\u5408\u3059\u308b\u305f\u3081\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=HTML\u30ab\u30b9\u30bf\u30e0
diff --git a/netbeans-l10n-zip/src/ja/ide/html-custom/html-custom/org/netbeans/modules/html/custom/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-custom/html-custom/org/netbeans/modules/html/custom/hints/Bundle_ja.properties
index 8db4236..1b7bbe8 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-custom/html-custom/org/netbeans/modules/html/custom/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-custom/html-custom/org/netbeans/modules/html/custom/hints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - a comma separated list of attribute names
 # {1} - name of the element where the attribute will be added
 addAttributeToSource=\u5c5e\u6027"{0}"\u3092\u8981\u7d20"{1}"\u306b\u8ffd\u52a0\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor-lib/html-editor-lib/org/netbeans/modules/html/editor/lib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor-lib/html-editor-lib/org/netbeans/modules/html/editor/lib/Bundle_ja.properties
index 87fad69..057c654 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor-lib/html-editor-lib/org/netbeans/modules/html/editor/lib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor-lib/html-editor-lib/org/netbeans/modules/html/editor/lib/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=HTML\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor-lib/html-editor-lib/org/netbeans/modules/html/editor/lib/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor-lib/html-editor-lib/org/netbeans/modules/html/editor/lib/api/Bundle_ja.properties
index 592bb93..a2c8e88 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor-lib/html-editor-lib/org/netbeans/modules/html/editor/lib/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor-lib/html-editor-lib/org/netbeans/modules/html/editor/lib/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_HTML_VERSION_32=HTML 3.2
 
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/Bundle_ja.properties
index 0b1435d..479639e 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/Bundle_ja.properties
@@ -1,33 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 edit.attribute.tooltip=\u5024\u3092\u7de8\u96c6\u3059\u308b\u304b\u3001\u7a7a\u306e\u5024\u3092\u8a2d\u5b9a\u3059\u308b\u3053\u3068\u3067\u5c5e\u6027\u3092\u524a\u9664\u3067\u304d\u307e\u3059
 element.element.attributes.title=\u8981\u7d20\u5c5e\u6027
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/api/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/api/actions/Bundle_ja.properties
index e853ba1..effe0b7 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/api/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/api/actions/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 action.name_delete.element=\u524a\u9664
 action.name_modify.rules=\u30eb\u30fc\u30eb\u306e\u5909\u66f4
 
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/codegen/Bundle_ja.properties
index 6a76996..724b243 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/codegen/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_lorem_ipsum=\u30ed\u30ec\u30e0\u30fb\u30a4\u30d7\u30b5\u30e0\u30fb\u30c6\u30ad\u30b9\u30c8
 LBL_generate_lorem_ipsum=\u30ed\u30ec\u30e0\u30fb\u30a4\u30d7\u30b5\u30e0\u3092\u751f\u6210
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/completion/Bundle_ja.properties
index ff2e61b..5c42cba 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_No_Doc_For_Target=<b>\u30ea\u30f3\u30af\u30fb\u30bf\u30fc\u30b2\u30c3\u30c8\u306b\u4f7f\u7528\u53ef\u80fd\u306a\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u3042\u308a\u307e\u305b\u3093</b>
 
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/gsf/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/gsf/Bundle_ja.properties
index f1e7b3d..adb5afd 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/gsf/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/gsf/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FT_Tag=\u30bf\u30b0
 MSG_Unrelated=\u95a2\u9023\u306e\u306a\u3044
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/Bundle_ja.properties
index f098dc1..183cb1a 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Options
 csl-hints/text/html/hints/general=HTML\u30d0\u30ea\u30c7\u30fc\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/css/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/css/Bundle_ja.properties
index 0154284..de1a1d8 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/css/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/css/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Options
 csl-hints/text/html/hints/css=CSS
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/other/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/other/Bundle_ja.properties
index f89913b..cd4d7b8 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/other/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/hints/other/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ExtractInlinedStyleRuleName=\u672c\u6587\u306e\u30b9\u30bf\u30a4\u30eb\u3092\u62bd\u51fa
 MSG_RemoveSurroundingTag=\u56f2\u3093\u3067\u3044\u308b\u30bf\u30b0\u3092\u524a\u9664
 MSG_SurroundWithTag=\u30bf\u30b0\u3067\u56f2\u3080
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/options/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/options/ui/Bundle_ja.properties
index 891d4d6..80d6e60 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/options/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/options/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #SAMPLE_Default=function Foo () {\
 #    var test = "test";\
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/options/ui/formatSample_ja.html b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/options/ui/formatSample_ja.html
index 0cd69d2..3510d79 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/options/ui/formatSample_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/options/ui/formatSample_ja.html
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <!DOCTYPE html>
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/refactoring/Bundle_ja.properties
index 4fd1f21..8c05f9f 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Modify_File_Import=\u30d5\u30a1\u30a4\u30eb\u53c2\u7167\u306e\u5909\u66f4
 LBL_Rename=\u540d\u524d\u5909\u66f4
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/refactoring/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/refactoring/actions/Bundle_ja.properties
index 89b6b97..3905f3d 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/refactoring/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/refactoring/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ExtractInlinedStyle=\u672c\u6587\u306e\u30b9\u30bf\u30a4\u30eb\u3092\u62bd\u51fa...
 
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/resources/Bundle_ja.properties
index 23f1c25..ed50215 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=HTML\u30a8\u30c7\u30a3\u30bf
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/ui/Bundle_ja.properties
index ad09425..bd7edec 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-editor/html-editor/org/netbeans/modules/html/editor/ui/Bundle_ja.properties
@@ -1,44 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 class.selector.descr=\u3053\u306e\u30b9\u30bf\u30a4\u30eb\u30fb\u30af\u30e9\u30b9\u304c\u5272\u308a\u5f53\u3066\u3089\u308c\u3066\u3044\u308b\u3059\u3079\u3066\u306e\u8981\u7d20\u306b\u9069\u7528\u3057\u307e\u3059\u3002\n\n\u30bb\u30ec\u30af\u30bf\u540d\u306f\u30c9\u30c3\u30c8\u3067\u958b\u59cb\u3057\u307e\u3059\u3002
 class.selector.error=\u30af\u30e9\u30b9\u30fb\u30bb\u30ec\u30af\u30bf{0}\u306b\u7121\u52b9\u306a\u6587\u5b57\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
 id.selector.descr=\u3053\u306eID\u30bb\u30c3\u30c8\u3092\u6301\u30641\u3064\u306e\u8981\u7d20\u306b\u306e\u307f\u9069\u7528\u3057\u307e\u3059\u3002\n\n\u30bb\u30ec\u30af\u30bf\u540d\u306f\u30cf\u30c3\u30b7\u30e5\u8a18\u53f7\u3067\u958b\u59cb\u3057\u307e\u3059\u3002
 id.selector.error=ID {0}\u30bb\u30ec\u30af\u30bf\u306b\u7121\u52b9\u306a\u6587\u5b57\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 ModifyElementRulesPanel.jLabel2.text=\u30b9\u30bf\u30a4\u30eb\u30fb\u30b7\u30fc\u30c8
 ModifyElementRulesPanel.jLabel1.text=\u30bb\u30ec\u30af\u30bf\u30fb\u30bf\u30a4\u30d7
 ModifyElementRulesPanel.jLabel4.text=\u30bb\u30ec\u30af\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/html-knockout/html-knockout/org/netbeans/modules/html/knockout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-knockout/html-knockout/org/netbeans/modules/html/knockout/Bundle_ja.properties
index 1d33172..5ba1d61 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-knockout/html-knockout/org/netbeans/modules/html/knockout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-knockout/html-knockout/org/netbeans/modules/html/knockout/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 cannot_load_help=\u30d8\u30eb\u30d7\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002
 doc.building=Knockout\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 # {0} - the documentation URL
diff --git a/netbeans-l10n-zip/src/ja/ide/html-lexer/html-lexer/org/netbeans/lib/html/lexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-lexer/html-lexer/org/netbeans/lib/html/lexer/Bundle_ja.properties
index e3d225f..f832eb0 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-lexer/html-lexer/org/netbeans/lib/html/lexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-lexer/html-lexer/org/netbeans/lib/html/lexer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=HTML\u30ec\u30af\u30b5\u30fc
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/html-parser/html-parser/org/netbeans/modules/html/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-parser/html-parser/org/netbeans/modules/html/parser/Bundle_ja.properties
index 9c5e9dc..449640b 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-parser/html-parser/org/netbeans/modules/html/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-parser/html-parser/org/netbeans/modules/html/parser/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module descritpion
 OpenIDE-Module-Name=HTML\u30d1\u30fc\u30b5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/html-parser/html-parser/org/netbeans/modules/html/parser/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-parser/html-parser/org/netbeans/modules/html/parser/model/Bundle_ja.properties
index 2f5a88e..3f1e7c5 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-parser/html-parser/org/netbeans/modules/html/parser/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-parser/html-parser/org/netbeans/modules/html/parser/model/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ElementPrefix=\u8981\u7d20
 MSG_AttributePrefix=\u5c5e\u6027
diff --git a/netbeans-l10n-zip/src/ja/ide/html-validation/html-validation/org/netbeans/modules/html/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html-validation/html-validation/org/netbeans/modules/html/validation/Bundle_ja.properties
index fc94b7f..e0207d9 100755
--- a/netbeans-l10n-zip/src/ja/ide/html-validation/html-validation/org/netbeans/modules/html/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html-validation/html-validation/org/netbeans/modules/html/validation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Web
 OpenIDE-Module-Long-Description=HTML\u30d0\u30ea\u30c7\u30fc\u30bf\u306f\u3001WHATWG\u3067\u6307\u5b9a\u3055\u308c\u305f\u30eb\u30fc\u30eb\u306b\u5f93\u3044\u3001\u30aa\u30f3\u30fb\u30b6\u30fb\u30d5\u30e9\u30a4\u3067\u7de8\u96c6\u3055\u308c\u305fHTML\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u8a3c\u3057\u307e\u3059\u3002\u3053\u306e\u30b5\u30fc\u30d3\u30b9\u306f\u3001validator.nu\u3067\u30aa\u30f3\u30e9\u30a4\u30f3\u3067\u5229\u7528\u3067\u304d\u308bHTML\u30d0\u30ea\u30c7\u30fc\u30bf\u30fb\u30a8\u30f3\u30b8\u30f3\u306b\u57fa\u3065\u3044\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/Bundle_ja.properties
index 06a780f..6a5f991 100755
--- a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module description
 OpenIDE-Module-Name=HTML
diff --git a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/TemplateHelp_ja.html b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/TemplateHelp_ja.html
index 62a63ed..3321bb8 100755
--- a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/TemplateHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/TemplateHelp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/XhtmlTemplateHelp_ja.html b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/XhtmlTemplateHelp_ja.html
index b769d51..e9f36a5 100755
--- a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/XhtmlTemplateHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/XhtmlTemplateHelp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/catalog/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/catalog/Bundle_ja.properties
index 184926e..d6b5336 100755
--- a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/catalog/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/catalog/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_HtmlCatalog=HTML\u30ab\u30bf\u30ed\u30b0
 
diff --git a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/Bundle_ja.properties
index a22789f..fe6facd 100755
--- a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_OpenHTMLCustomizer=HTML/JSP\u30b3\u30fc\u30c9\u30fb\u30af\u30ea\u30c3\u30d7(&H)
 #HTML Palette: categories
diff --git a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/items/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/items/Bundle_ja.properties
index 663716e..44b57b4 100755
--- a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/items/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/items/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Customizer_InsertPrefix=\u633f\u5165
 
diff --git a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/items/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/items/resources/Bundle_ja.properties
index 83ffc76..d2d2730 100755
--- a/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/items/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/html/html/org/netbeans/modules/html/palette/items/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Palette: display names and tooltips for the components
 
diff --git a/netbeans-l10n-zip/src/ja/ide/httpserver/httpserver/org/netbeans/modules/httpserver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/httpserver/httpserver/org/netbeans/modules/httpserver/Bundle_ja.properties
index bc72891..7c2f529 100755
--- a/netbeans-l10n-zip/src/ja/ide/httpserver/httpserver/org/netbeans/modules/httpserver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/httpserver/httpserver/org/netbeans/modules/httpserver/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module description
 OpenIDE-Module-Name=HTTP\u30b5\u30fc\u30d0\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-git/hudson-git/org/netbeans/modules/hudson/git/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-git/hudson-git/org/netbeans/modules/hudson/git/Bundle_ja.properties
index afcde6e..4c626a5 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-git/hudson-git/org/netbeans/modules/hudson/git/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-git/hudson-git/org/netbeans/modules/hudson/git/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Hudson Git\u7d50\u5408
 # {0} - original URL
 # {1} - replacement URL
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-mercurial/hudson-mercurial/org/netbeans/modules/hudson/mercurial/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-mercurial/hudson-mercurial/org/netbeans/modules/hudson/mercurial/Bundle_ja.properties
index 73f5e90..9f8e126 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-mercurial/hudson-mercurial/org/netbeans/modules/hudson/mercurial/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-mercurial/hudson-mercurial/org/netbeans/modules/hudson/mercurial/Bundle_ja.properties
@@ -1,44 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 error.repo.in.parent=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306b\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30e1\u30bf\u30c7\u30fc\u30bf\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u30d3\u30eb\u30c9\u3092\u624b\u52d5\u3067\u69cb\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 # {0} - file basename
 # {1} - revision hash (or "null")
 
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Hudson Mercurial\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0
 # {0} - repository location
 warning.local_repo={0}\u306f\u3001\u540c\u3058\u30de\u30b7\u30f3\u306eHudson\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u307f\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-subversion/hudson-subversion/org/netbeans/modules/hudson/subversion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-subversion/hudson-subversion/org/netbeans/modules/hudson/subversion/Bundle_ja.properties
index 125dcc1..8578c47 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-subversion/hudson-subversion/org/netbeans/modules/hudson/subversion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-subversion/hudson-subversion/org/netbeans/modules/hudson/subversion/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - error message
 ERR_reading_folder=Subversion\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3092\u691c\u67fb\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f: {0}
 ERR_unsupported=Subversion\u4f5c\u696d\u30b3\u30d4\u30fc\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Hudson Subversion\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0
 # {0} - file basename
 # {1} - revision number
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-tasklist/hudson-tasklist/org/netbeans/modules/hudson/tasklist/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-tasklist/hudson-tasklist/org/netbeans/modules/hudson/tasklist/Bundle_ja.properties
index 8ccab38..b2acdaf 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-tasklist/hudson-tasklist/org/netbeans/modules/hudson/tasklist/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-tasklist/hudson-tasklist/org/netbeans/modules/hudson/tasklist/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 HudsonScanner.description=\u73fe\u5728\u3001Static Analysis\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30b9\u30a4\u30fc\u30c8\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u308bHudson\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u8b66\u544a\u304a\u3088\u3073\u305d\u306e\u4ed6\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u9805\u76ee\u3002
 HudsonScanner.displayName=Hudson\u8b66\u544a
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Hudson\u30a2\u30af\u30b7\u30e7\u30f3\u9805\u76ee
 
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/Bundle_ja.properties
index 170710b..579a117 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - server location
 # {1} - user name
 APITokenConnectionAuthenticator.password_description={0}\u4e0a\u306e{1}\u306eAPI\u30c8\u30fc\u30af\u30f3
@@ -6,47 +23,6 @@
 # {1} - user name
 FormLogin.password_description={0}\u4e0a\u306e{1}\u306e\u30d1\u30b9\u30ef\u30fc\u30c9
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
-# 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-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.
 OpenIDE-Module-Name=Hudson UI
 
 FormLogin.locationLabel.text=\u30b5\u30fc\u30d0\u30fc(&S):
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/actions/Bundle_ja.properties
index 9ae4853..b347ed3 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AddTestInstanceAction.could_not_run=Hudson\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u307e\u305f\u306f\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u5b9f\u884c: javaws https://hudson.dev.java.net/hudson.jnlp
 AddTestInstanceAction.instance_name=\u30ed\u30fc\u30ab\u30eb\u30fb\u30c6\u30b9\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/api/Bundle_ja.properties
index 4884d5e..0fab0cd 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - file basename
 HudsonSCM.diffing={0}\u306e\u5dee\u5206...
 # {0} - portion of file path
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/impl/Bundle_ja.properties
index 9ff1fdd..ac53790 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/impl/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - file path in workspace
 Hyperlinker.looking_for={0}\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059...
 # {0} - file path in workspace
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/nodes/Bundle_ja.properties
index 4f067ac..7836d35 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DESC_Instance_Prop_Name=Hudson\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u540d
 DESC_Instance_Prop_Sync=\u5206\u5358\u4f4d\u3067\u306e\u81ea\u52d5\u540c\u671f\u6642\u9593(0\u306e\u5834\u5408\u306f\u81ea\u52d5\u540c\u671f\u306f\u30aa\u30d5)
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/notification/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/notification/Bundle_ja.properties
index 18b2fac..dffffde 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/notification/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/notification/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ProblemNotification.description.failed=\u30d3\u30eb\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 ProblemNotification.description.unstable=\u3044\u304f\u3064\u304b\u306e\u30c6\u30b9\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/spi/Bundle_ja.properties
index 4b8bc2f..810b1fd 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/spi/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ProjectHudsonJobCreatorFactory.no_vcs=\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30b7\u30b9\u30c6\u30e0\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/wizard/Bundle_ja.properties
index b8a0dfe..79a8e40 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson-ui/hudson-ui/org/netbeans/modules/hudson/ui/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_InstanceWiz_Title=Hudson\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u8ffd\u52a0
 InstanceDialog.add=\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/Bundle_ja.properties
index d5ea350..aa6f3cb 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=Hudson\u7d99\u7d9a\u7684\u30a4\u30f3\u30c6\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30fc\u30d0\u30fc(http://hudson-ci.org/)\u306e\u53c2\u7167\u3068\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306e\u7ba1\u7406\u3092\u652f\u63f4\u3057\u307e\u3059\u3002http://wiki.netbeans.org/HudsonInNetBeans\u306b\u8a73\u7d30\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/api/Bundle_ja.properties
index fbe9da0..cfff0eb 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - URL
 ConnectionBuilder.log_in={0}\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u306b\u306f\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/impl/Bundle_ja.properties
index 60bd758..4b2758c 100755
--- a/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/hudson/hudson/org/netbeans/modules/hudson/impl/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - job/module display name
 # {1} - build number
 
diff --git a/netbeans-l10n-zip/src/ja/ide/ide-kit/ide-kit/org/netbeans/modules/ide/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/ide-kit/ide-kit/org/netbeans/modules/ide/kit/Bundle_ja.properties
index c332b5b..0309744 100755
--- a/netbeans-l10n-zip/src/ja/ide/ide-kit/ide-kit/org/netbeans/modules/ide/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/ide-kit/ide-kit/org/netbeans/modules/ide/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=IDE\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306f\u3001\u901a\u5e38\u3044\u305a\u308c\u306e\u53ef\u8996\u30d7\u30e9\u30b0\u30a4\u30f3\u306b\u3082\u5c5e\u3055\u306a\u3044\u304c\u3001\u305d\u308c\u3089\u3092\u5fc5\u8981\u3068\u3059\u308b\u30d7\u30e9\u30b0\u30a4\u30f3\u3068\u3068\u3082\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u30d9\u30fc\u30b9IDE\u5185\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u3067\u69cb\u6210\u3055\u308c\u3066\u3044\u307e\u3059\u3002IDE\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u30e2\u30b8\u30e5\u30fc\u30eb(NBMs)\u306b\u306f\u3001\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fb\u30c1\u30e5\u30fc\u30b6\u3001\u5916\u90e8HTML\u30d6\u30e9\u30a6\u30b6\u3001\u5916\u90e8\u30e9\u30a4\u30d6\u30e9\u30ea\u3001\u4e00\u822c\u30aa\u30f3\u30e9\u30a4\u30f3\u30fb\u30d8\u30eb\u30d7\u3001\u4e00\u822c\u30aa\u30d7\u30b7\u30e7\u30f3\u30fb\u30c0\u30a4\u30a2\u30ed\u30b0\u30fb\u30d1\u30cd\u30eb\u3001\u4e00\u822c\u8a00\u8a9e\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3001HTTP\u30b5\u30fc\u30d0\u30fc\u3001IDE\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8UI\u3001\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0API\u3001\u30bf\u30b0\u30fb\u30d9\u30fc\u30b9\u306e\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u3001\u30bf\u30a4\u30de\u30fcAPI\u3001\u304a\u3088\u3073\u30e6\u30fc\u30b6\u30fc\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u304c\u3042\u308a\u307e\u3059\u3002
 OpenIDE-Module-Name=IDE\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/Bundle_ja.properties
index fb84f2a..2d47156 100755
--- a/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ImageDataObject.ImageNode
 HINT_Thumbnail=\u30b5\u30e0\u30cd\u30a4\u30eb\u3092\u8868\u793a\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/action/Bundle_ja.properties
index b53bea0..7adc8ed 100755
--- a/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/action/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ExternalEdit=\u5916\u90e8\u30a8\u30c7\u30a3\u30bf\u3067\u958b\u304f
 
diff --git a/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/navigation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/navigation/Bundle_ja.properties
index 816d3de..cb7ab30 100755
--- a/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/navigation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/image/image/org/netbeans/modules/image/navigation/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ImageNavigatorPanel
 Navigator_DisplayName=\u30a4\u30e1\u30fc\u30b8\u306e\u30d7\u30ec\u30d3\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/Bundle_ja.properties
index 8a1d5c0..5cfcd3a 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-#
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=JavaScript\u30c7\u30d0\u30c3\u30b0UI\u306b\u5bfe\u3059\u308b\u6c4e\u7528\u30c7\u30d0\u30c3\u30ac\u30fb\u30b5\u30dd\u30fc\u30c8\u3002Javascript\u30c7\u30d0\u30c3\u30ac\u3067\u4f7f\u7528\u3055\u308c\u308b\u5171\u901aUI\u304c\u542b\u307e\u308c\u307e\u3059\u3002
 OpenIDE-Module-Name=JavaScript\u6c4e\u7528\u30c7\u30d0\u30c3\u30b0UI\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/annotation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/annotation/Bundle_ja.properties
index 6138185..74245c9 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/annotation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/annotation/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TOOLTIP_ALL_BREAKPOINTS_DEACTIVATED=\u3059\u3079\u3066\u306e\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u304c\u975e\u30a2\u30af\u30c6\u30a3\u30d6\u5316\u3055\u308c\u307e\u3059
 TOOLTIP_BREAKPOINT=\u884c\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8
 TOOLTIP_BREAKPOINT_BROKEN=\u672a\u89e3\u6c7a\u306e\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/breakpoints/Bundle_ja.properties
index 84bc24e..01e314b 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_Breakpoint_Customizer_Dialog=\u3053\u306e\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3057\u307e\u3059
 JavaScriptBreakpointTypeCategory=JavaScript
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/models/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/models/breakpoints/Bundle_ja.properties
index 3f0f029..9e16abb 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/models/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug-ui/javascript2-debug-ui/org/netbeans/modules/javascript2/debug/ui/models/breakpoints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_APPEND_BP_Invalid=[\u7121\u52b9]
 # {0} - message describing why is the breakpoint invalid.
 CTL_APPEND_BP_Invalid_with_reason=[\u7121\u52b9\u3002\u7406\u7531: {0}]
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/Bundle_ja.properties
index d4221d0..68cab3a 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-#
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=JavaScript\u30c7\u30d0\u30c3\u30b0\u306b\u5bfe\u3059\u308b\u6c4e\u7528\u30c7\u30d0\u30c3\u30ac\u30fb\u30b5\u30dd\u30fc\u30c8\u3002Javascript\u30c7\u30d0\u30c3\u30ac\u3067\u4f7f\u7528\u3055\u308c\u308b\u5171\u901a\u30d9\u30fc\u30b9\u304c\u542b\u307e\u308c\u307e\u3059\u3002
 OpenIDE-Module-Name=JavaScript\u6c4e\u7528\u30c7\u30d0\u30c3\u30b0\u30fb\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/annotation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/annotation/Bundle_ja.properties
index 6138185..74245c9 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/annotation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/annotation/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TOOLTIP_ALL_BREAKPOINTS_DEACTIVATED=\u3059\u3079\u3066\u306e\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u304c\u975e\u30a2\u30af\u30c6\u30a3\u30d6\u5316\u3055\u308c\u307e\u3059
 TOOLTIP_BREAKPOINT=\u884c\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8
 TOOLTIP_BREAKPOINT_BROKEN=\u672a\u89e3\u6c7a\u306e\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/Bundle_ja.properties
index b532d04..c06933b 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JavaScriptBreakpointTypeCategory=JavaScript
 LineBreakpointTypeName=\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/models/Bundle_ja.properties
index 3f0f029..9e16abb 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/models/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_APPEND_BP_Invalid=[\u7121\u52b9]
 # {0} - message describing why is the breakpoint invalid.
 CTL_APPEND_BP_Invalid_with_reason=[\u7121\u52b9\u3002\u7406\u7531: {0}]
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/ui/Bundle_ja.properties
index 4707dcd..0194ec5 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/breakpoints/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ACSD_Breakpoint_Customizer_Dialog=\u3053\u306e\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3057\u307e\u3059
 JSLineBreakpointCustomizerPanel.fileLabel.text=\u30d5\u30a1\u30a4\u30eb(&F):
 JSLineBreakpointCustomizerPanel.lineLabel.text=\u884c\u756a\u53f7(&L):
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/sources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/sources/Bundle_ja.properties
index 3734a2a..ca7cd98 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/sources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-debug/javascript2-debug/org/netbeans/modules/javascript2/debug/sources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 SourceFSDisplayName=JavaScript\u30bd\u30fc\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_ja.properties
index a905552..6a01bb2 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 
 
@@ -7,47 +24,6 @@
 JsCompletionItem.lbl.js.platform=JS\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
 JsonResolver=JSON\u30d5\u30a1\u30a4\u30eb
 JsResolver=JavaScript\u30d5\u30a1\u30a4\u30eb
-# 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-2009 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.
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript2\u30a8\u30c7\u30a3\u30bf
 OpenIDE-Module-Short-Description=JavaScript\u7de8\u96c6\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/actions/Bundle_ja.properties
index 1ced2e7..5242706 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 complete-line=\u884c\u3092\u5b8c\u4e86
 complete-line-newline=\u884c\u3092\u5b8c\u4e86\u3057\u3066\u65b0\u3057\u3044\u884c\u3092\u4f5c\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/api/Bundle_ja.properties
index fceba6b..bc228f1 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/api/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_CATEGORY_FRAMEWORKS_LABEL=JavaScript\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/doc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/doc/Bundle_ja.properties
index a86dec7..130aea6 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/doc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/doc/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JsDocumentationPrinter.title.deprecated=\u975e\u63a8\u5968
 JsDocumentationPrinter.title.description=\u8aac\u660e
 JsDocumentationPrinter.title.examples=\u4f8b
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/Bundle_ja.properties
index d94f71f..743ca29 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_bp_SAMELINE=\u540c\u3058\u884c
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_ja.properties
index 7078ad4..56a4c2c 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_TabsAndIndents=\u30bf\u30d6\u3068\u30a4\u30f3\u30c7\u30f3\u30c8
 FmtTabsIndents.AccessibleContext.accessibleName=\u30bf\u30d6\u3068\u30a4\u30f3\u30c7\u30f3\u30c8\u30fb\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/json/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/json/Bundle_ja.properties
index a51e066..5a87041 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/json/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/json/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_TabsAndIndents=\u30bf\u30d6\u3068\u30a4\u30f3\u30c7\u30f3\u30c8
 FmtTabsIndents.AccessibleContext.accessibleName=\u30bf\u30d6\u3068\u30a4\u30f3\u30c7\u30f3\u30c8\u30fb\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/hints/Bundle_ja.properties
index 0ef869f..acce666 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/hints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AddGlobalJsHint_Description=JsHint\u30b0\u30ed\u30fc\u30d0\u30eb\u30fb\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u3092\u751f\u6210\u3057\u307e\u3059
 ArrayTrailingCommaDescription=\u914d\u5217\u30ea\u30c6\u30e9\u30eb\u306e\u6700\u5f8c\u306e\u30a2\u30a4\u30c6\u30e0\u306e\u5f8c\u306b','\u304c\u3042\u308b\u5834\u5408\u306b\u8b66\u544a\u3057\u307e\u3059\u3002
 ArrayTrailingCommaDisplayName=\u914d\u5217\u30ea\u30c6\u30e9\u30eb\u5185\u306e\u672b\u5c3e\u306e\u30ab\u30f3\u30de
@@ -6,45 +23,6 @@
 AssignmentInConditionDisplayName=\u6761\u4ef6\u5185\u306e\u4ee3\u5165
 BetterConditionDescription=\u6761\u4ef6\u3067===\u307e\u305f\u306f!==\u3067\u306f\u306a\u304f==\u307e\u305f\u306f!=\u304c\u4f7f\u7528\u3055\u308c\u3066\u3044\u308b\u30b1\u30fc\u30b9\u3092\u30ec\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002
 BetterConditionDisplayName===\u307e\u305f\u306f!=\u3067\u306f\u306a\u304f===\u307e\u305f\u306f!==\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2012 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
 csl-hints/text/javascript/hints/convention=JS\u8868\u8a18\u898f\u5247
 csl-hints/text/javascript/hints/documentation=JS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
 csl-hints/text/javascript/hints/other=\u305d\u306e\u4ed6
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/model/Bundle_ja.properties
index 80f168c..7877536 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/model/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_DefaultDocContentForURL=\u3053\u306e\u6a5f\u80fd\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u3001\u3053\u306e\u30c6\u30ad\u30b9\u30c8\u306e\u4e0a\u306b\u3042\u308b\u30c4\u30fc\u30eb\u30d0\u30fc\u306e\u30d6\u30e9\u30a6\u30b6\u30fb\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_ja.properties
index 977a9f8..877556b 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CodeCompletionPanel.AccessibleContext.accessibleDescription=JavaScript\u30b3\u30fc\u30c9\u88dc\u5b8c\u69cb\u6210\u306e\u30d1\u30cd\u30eb\u3002
 CodeCompletionPanel.AccessibleContext.accessibleName=JavaScript\u30b3\u30fc\u30c9\u88dc\u5b8c\u69cb\u6210\u30d1\u30cd\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/json/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/json/Bundle_ja.properties
index 9b1a82d..cbb7690 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/json/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/json/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CodeCompletionPanel.AccessibleContext.accessibleDescription=JSON\u30b3\u30fc\u30c9\u88dc\u5b8c\u69cb\u6210\u306e\u30d1\u30cd\u30eb\u3002
 CodeCompletionPanel.AccessibleContext.accessibleName=JSON\u30b3\u30fc\u30c9\u88dc\u5b8c\u69cb\u6210\u30d1\u30cd\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/parser/Bundle_ja.properties
index 69902ea..a257f2b 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/parser/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - file name
 disableFilterForFile="{0}"\u3067\u306eJS\u30a8\u30e9\u30fc\u306e\u30d5\u30a3\u30eb\u30bf\u30ea\u30f3\u30b0\u306e\u7121\u52b9\u5316
 # {0} - file name
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/Bundle_ja.properties
index a59af9f..fd1a679 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Other/javascript.js=JavaScript\u30d5\u30a1\u30a4\u30eb
 Templates/Other/json.json=JSON\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/javascript_ja.html b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/javascript_ja.html
index c462a76..ca238c4 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/javascript_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/javascript_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/json_ja.html b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/json_ja.html
index 0e1ef5a..99e8985 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/json_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/json_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-extjs/javascript2-extjs/org/netbeans/modules/javascript2/extjs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-extjs/javascript2-extjs/org/netbeans/modules/javascript2/extjs/Bundle_ja.properties
index 0a0d0ef..21c6d60 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-extjs/javascript2-extjs/org/netbeans/modules/javascript2/extjs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-extjs/javascript2-extjs/org/netbeans/modules/javascript2/extjs/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ExtJsCompletionItem.lbl.extjs.framework=\u5916\u90e8JS
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=\u5916\u90e8Ext JS\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30a8\u30c7\u30a3\u30bf\u30fb\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/Bundle_ja.properties
index 8f9f2fe..bdcafe6 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript Jade\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/editor/Bundle_ja.properties
index 0a0f9c5..ec60917 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/editor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 JadeResolver=Jade\u30d5\u30a1\u30a4\u30eb
 LBL_JadeEditorTab=\u30bd\u30fc\u30b9(&S)
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/Bundle_ja.properties
index f880388..80b503b 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):  Petr Pisl
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/ClientSide/jadeTemplate.jade=Jade\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/jadeTemplate_ja.html b/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/jadeTemplate_ja.html
index 2f4c0a3..e57d699 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/jadeTemplate_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/jadeTemplate_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/Bundle_ja.properties
index 196bf59..4089753 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript2 jQuery
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/editor/Bundle_ja.properties
index 7ecd459..6af8a23 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/editor/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JQueryCompletionItem.lbl.jquery=jQuery
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-kit/javascript2-kit/org/netbeans/modules/javascript2/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-kit/javascript2-kit/org/netbeans/modules/javascript2/kit/Bundle_ja.properties
index 38a6db6..8599e64 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-kit/javascript2-kit/org/netbeans/modules/javascript2/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-kit/javascript2-kit/org/netbeans/modules/javascript2/kit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript2\u30ad\u30c3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/Bundle_ja.properties
index 33b7df2..9b72b5e 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript2 Knockout
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/model/Bundle_ja.properties
index 87b8cc4..84bec20 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/model/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 label_knockout=Knockout
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/editor/Bundle_ja.properties
index d79255c..dc002ee 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/editor/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 doc.building=NodeJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 # {0} - the documentation URL
 doc.cannotGet="{0}"\u304b\u3089NodeJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/resources/Bundle_ja.properties
index 45fa852..dcfc693 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=Node.js\u306b\u5bfe\u3059\u308b\u30a8\u30c7\u30a3\u30bf\u30fb\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-prototypejs/javascript2-prototypejs/org/netbeans/modules/javascript2/prototypejs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-prototypejs/javascript2-prototypejs/org/netbeans/modules/javascript2/prototypejs/Bundle_ja.properties
index 917af20..e7fabc9 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-prototypejs/javascript2-prototypejs/org/netbeans/modules/javascript2/prototypejs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-prototypejs/javascript2-prototypejs/org/netbeans/modules/javascript2/prototypejs/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=PrototypeJs\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30a8\u30c7\u30a3\u30bf\u30fb\u30b5\u30dd\u30fc\u30c8\u3002\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u8a73\u7d30\u306f\u3001http://prototypejs.org/\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 OpenIDE-Module-Name=JavaScript2 PrototypeJs
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/Bundle_ja.properties
index eb4c8d2..f4a04a1 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 doc.building=RequireJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 # {0} - the documentation URL
 doc.cannotGet="{0}"\u304b\u3089RequireJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/Bundle_ja.properties
index e7e1941..9c3712f 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 mappedFile=\u30d5\u30a1\u30a4\u30eb
 mappedFolder=\u30d5\u30a9\u30eb\u30c0
 mappedToVirtual=\u5b58\u5728\u3057\u306a\u3044\u30d5\u30a9\u30eb\u30c0/\u30d5\u30a1\u30a4\u30eb\u306b\u30de\u30c3\u30d7\u3055\u308c\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/model/Bundle_ja.properties
index 80f87be..f027979 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/model/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 label_requirejs=RequireJS
 
diff --git a/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/ui/Bundle_ja.properties
index d6a0c2e..d21773f 100755
--- a/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/ui/Bundle_ja.properties
@@ -1,43 +1,19 @@
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 RequireJsCustomizer.displayName=RequireJs
 # customizer panel
diff --git a/netbeans-l10n-zip/src/ja/ide/jellytools-ide/jellytools-ide/org/netbeans/modules/jellytools/ide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/jellytools-ide/jellytools-ide/org/netbeans/modules/jellytools/ide/Bundle_ja.properties
index ec39584..89f4e3a 100755
--- a/netbeans-l10n-zip/src/ja/ide/jellytools-ide/jellytools-ide/org/netbeans/modules/jellytools/ide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/jellytools-ide/jellytools-ide/org/netbeans/modules/jellytools/ide/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Jelly\u30c4\u30fc\u30ebIDE
 
diff --git a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/common/Bundle_ja.properties
index 2272488..7644be7 100755
--- a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/common/Bundle_ja.properties
@@ -1,41 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_IllegalContent=\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30f3\u30c4
 
diff --git a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/file/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/file/Bundle_ja.properties
index 9201ae5..ce0a2c4 100755
--- a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/file/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/file/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # FileSearchAction
 CTL_FileSearchAction=\u30d5\u30a1\u30a4\u30eb\u306b\u79fb\u52d5(&F)...
diff --git a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/resources/Bundle_ja.properties
index a9e14b7..059dc08 100755
--- a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/resources/Bundle_ja.properties
@@ -1,38 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30b8\u30e3\u30f3\u30d7\u5148
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/settings/Bundle_ja.properties
index 4ae2665..e9bc1e2 100755
--- a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/settings/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_Highlight=\u5f37\u8abf\u8868\u793a(&H):
 LBL_Highlighting=\u30c0\u30a4\u30a2\u30ed\u30b0\u4e00\u81f4\u5f37\u8abf\u8868\u793a\u306b\u79fb\u52d5
 LBL_Highlight_By=\u6b21\u3092\u4f7f\u7528\u3059\u308b\u5f37\u8abf\u8868\u793a(&U):
diff --git a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/symbol/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/symbol/Bundle_ja.properties
index 578d4c5..3c1f02a 100755
--- a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/symbol/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/symbol/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 DLG_GoToSymbol=\u30b7\u30f3\u30dc\u30eb\u3078\u79fb\u52d5
 TXT_GoToSymbol=\u30b7\u30f3\u30dc\u30eb\u3078\u79fb\u52d5(&Y)...
 CTL_OK=OK
diff --git a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/type/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/type/Bundle_ja.properties
index 2a2cff7..655d773 100755
--- a/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/type/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/jumpto/jumpto/org/netbeans/modules/jumpto/type/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Name=\u578b\u306b\u79fb\u52d5
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/languages-diff/languages-diff/org/netbeans/modules/languages/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/languages-diff/languages-diff/org/netbeans/modules/languages/diff/Bundle_ja.properties
index c8867f7..458f72e 100755
--- a/netbeans-l10n-zip/src/ja/ide/languages-diff/languages-diff/org/netbeans/modules/languages/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/languages-diff/languages-diff/org/netbeans/modules/languages/diff/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=.diff\u30d5\u30a1\u30a4\u30eb\u30fb\u30a8\u30c7\u30a3\u30bf\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=\u8a00\u8a9e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/languages-manifest/languages-manifest/org/netbeans/modules/languages/manifest/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/languages-manifest/languages-manifest/org/netbeans/modules/languages/manifest/Bundle_ja.properties
index 24ca6b6..e775817 100755
--- a/netbeans-l10n-zip/src/ja/ide/languages-manifest/languages-manifest/org/netbeans/modules/languages/manifest/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/languages-manifest/languages-manifest/org/netbeans/modules/languages/manifest/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=.manifest\u30d5\u30a1\u30a4\u30eb\u30fb\u30a8\u30c7\u30a3\u30bf\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=\u8a00\u8a9e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/languages-yaml/languages-yaml/org/netbeans/modules/languages/yaml/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/languages-yaml/languages-yaml/org/netbeans/modules/languages/yaml/Bundle_ja.properties
index 5e7d338..75ac864 100755
--- a/netbeans-l10n-zip/src/ja/ide/languages-yaml/languages-yaml/org/netbeans/modules/languages/yaml/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/languages-yaml/languages-yaml/org/netbeans/modules/languages/yaml/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=YAML\u30a8\u30c7\u30a3\u30bf\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Ruby
diff --git a/netbeans-l10n-zip/src/ja/ide/languages-yaml/languages-yaml/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription_ja.html b/netbeans-l10n-zip/src/ja/ide/languages-yaml/languages-yaml/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription_ja.html
index 6b4530c..24d452c 100755
--- a/netbeans-l10n-zip/src/ja/ide/languages-yaml/languages-yaml/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/languages-yaml/languages-yaml/org/netbeans/modules/languages/yaml/EmptyYAMLFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/Bundle_ja.properties
index 6c5ad8b..111a7af 100755
--- a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u6c4e\u7528\u8a00\u8a9e\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 OpenIDE-Module-Display-Category=\u8a00\u8a9e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/dataobject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/dataobject/Bundle_ja.properties
index 402329f..df67eff 100755
--- a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/dataobject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/dataobject/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_mf_loader_name=\u6c4e\u7528\u8a00\u8a9e\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u30fb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/features/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/features/Bundle_ja.properties
index 1e626de..97f773f 100755
--- a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/features/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/features/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 in-place-refactoring=\u30a4\u30f3\u30d7\u30ec\u30fc\u30b9\u30fb\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/parser/Bundle_ja.properties
index 0e095f6..18fa970 100755
--- a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/parser/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_Unexpected_end_of_file=\u4e88\u671f\u3057\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u306e\u7d42\u308f\u308a
diff --git a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/resources/Bundle_ja.properties
index 5ec303f..b7dfe55 100755
--- a/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/languages/languages/org/netbeans/modules/languages/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Error=\u30a8\u30e9\u30fc
 CTL_Deprecation=\u975e\u63a8\u5968
diff --git a/netbeans-l10n-zip/src/ja/ide/lexer-nbbridge/lexer-nbbridge/org/netbeans/modules/lexer/nbbridge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/lexer-nbbridge/lexer-nbbridge/org/netbeans/modules/lexer/nbbridge/Bundle_ja.properties
index a138e1f..c548ffe 100755
--- a/netbeans-l10n-zip/src/ja/ide/lexer-nbbridge/lexer-nbbridge/org/netbeans/modules/lexer/nbbridge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/lexer-nbbridge/lexer-nbbridge/org/netbeans/modules/lexer/nbbridge/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Long-Description=\u8a00\u8a9e\u3092xml-layer\u306b\u767b\u9332\u3067\u304d\u308b\u3088\u3046\u306b\u3001MimeLookup\u304b\u3089\u8a00\u8a9e\u306e\u8a18\u8ff0\u3092\u53d6\u5f97\u3059\u308bLanguageProvider\u306e\u5b9f\u88c5\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30ec\u30af\u30b5\u30fc\u304b\u3089NetBeans\u3078\u306e\u30d6\u30ea\u30c3\u30b8
diff --git a/netbeans-l10n-zip/src/ja/ide/lexer/lexer/org/netbeans/lib/lexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/lexer/lexer/org/netbeans/lib/lexer/Bundle_ja.properties
index 5a6e7f5..c47bf67 100755
--- a/netbeans-l10n-zip/src/ja/ide/lexer/lexer/org/netbeans/lib/lexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/lexer/lexer/org/netbeans/lib/lexer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30ec\u30af\u30b5\u30fc
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/Bundle_ja.properties
index bed1d79..64884b3 100755
--- a/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=\u30ed\u30fc\u30ab\u30eb\u306e\u5909\u66f4\u3092\u8868\u793a\u3057\u3001\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3059\u308b\u305f\u3081\u306e\u6a5f\u80fd\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002IDE\u3067\u4f5c\u6210\u3001\u5909\u66f4\u3001\u307e\u305f\u306f\u524a\u9664\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u4fdd\u5b58\u3057\u3001\u6700\u8fd1\u4fdd\u5b58\u3055\u308c\u305f\u30c7\u30fc\u30bf\u306e\u5fa9\u5143\u3092\u53ef\u80fd\u306b\u3057\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/ui/actions/Bundle_ja.properties
index cbd62f5..af9277c 100755
--- a/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/ui/actions/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_ShowRevertDeleted=\u524a\u9664\u3092\u5143\u306b\u623b\u3059(&D)
 MSG_NO_FILES=\u9078\u629e\u3055\u308c\u305f\u30d5\u30a9\u30eb\u30c0\u5185\u306b\u524a\u9664\u6e08\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 LBL_SELECT_FILES=\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/ui/view/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/ui/view/Bundle_ja.properties
index 35c9ec8..3627cfe 100755
--- a/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/ui/view/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/localhistory/localhistory/org/netbeans/modules/localhistory/ui/view/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_LocalHistory_Column_Label=\u30e1\u30c3\u30bb\u30fc\u30b8
 LBL_LocalHistory_Column_Label_Desc=\u5909\u66f4\u3092\u8aac\u660e\u3059\u308b\u30e1\u30c3\u30bb\u30fc\u30b8\u307e\u305f\u306f\u30e9\u30d9\u30eb
 LBL_LocalHistory_Column_Version=\u30ea\u30d3\u30b8\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/localtasks/localtasks/org/netbeans/modules/localtasks/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/localtasks/localtasks/org/netbeans/modules/localtasks/Bundle_ja.properties
index 760bdda..6a18cff 100755
--- a/netbeans-l10n-zip/src/ja/ide/localtasks/localtasks/org/netbeans/modules/localtasks/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/localtasks/localtasks/org/netbeans/modules/localtasks/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - repository URL
 CTL_LocalRepository.tooltip=\u30ed\u30fc\u30ab\u30eb\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea: {0}
diff --git a/netbeans-l10n-zip/src/ja/ide/localtasks/localtasks/org/netbeans/modules/localtasks/task/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/localtasks/localtasks/org/netbeans/modules/localtasks/task/Bundle_ja.properties
index 9f9d6db..d818d09 100755
--- a/netbeans-l10n-zip/src/ja/ide/localtasks/localtasks/org/netbeans/modules/localtasks/task/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/localtasks/localtasks/org/netbeans/modules/localtasks/task/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Attachment.action.create=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb\u306e\u8ffd\u52a0
 CTL_AttachmentAction.Remove=\u9664\u53bb
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle_ja.properties
index 3688e3f..3e23fc9 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - file path
 MSG_CopyFailed_NotExists={0}\u304c\u5b58\u5728\u3057\u306a\u3044\u305f\u3081\u3001\u30b3\u30d4\u30fc\u306b\u5931\u6557\u3057\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/commands/Bundle_ja.properties
index 04c8613..fa89b9c 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_HgCommand.Rebase.failed=\u30ea\u30d9\u30fc\u30b9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 MSG_NO_REPOSITORY_ERR=Mercurial\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u898b\u3064\u3051\u3089\u308c\u307e\u305b\u3093\u3067\u3057\u305f
 
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/kenai/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/kenai/Bundle_ja.properties
index e7b0939..b35eafe 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/kenai/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/kenai/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_NotificationBubble_Description=\u6b21\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f:<\\br>{0}<a href="{1}">\u30ea\u30d3\u30b8\u30e7\u30f3\u306e\u8a73\u7d30\u3092\u8868\u793a</a>
 
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/options/Bundle_ja.properties
index 24847b0..4c02d3e 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_AnnotationColorsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/resources/Bundle_ja.properties
index 54a9941..b407ff7 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## hg-layer.xml
 
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/add/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/add/Bundle_ja.properties
index cb1b5bc..e5562c1 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/add/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/add/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Add=\u8ffd\u52a0(&A)
 CTL_PopupMenuItem_Add=\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/annotate/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/annotate/Bundle_ja.properties
index db5b421..4008187 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/annotate/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/annotate/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - changeset id
 CTL_AnnotationBar.action.showCommit=\u30ea\u30d3\u30b8\u30e7\u30f3{0}\u306e\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/branch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/branch/Bundle_ja.properties
index 2b3c4f4..09d3328 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/branch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/branch/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_CloseBranch=\u5206\u5c90\u3092\u9589\u3058\u308b(&L)...
 CTL_MenuItem_CreateBranch=\u5206\u5c90\u3092\u4f5c\u6210(&B)...
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/clone/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/clone/Bundle_ja.properties
index b2efcf3..50a3001 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/clone/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/clone/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_CloneExternal=\u4ed6\u3092\u30af\u30ed\u30fc\u30f3(&R)...
 # {0} - repository folder name
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/commit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/commit/Bundle_ja.properties
index 80970dc..b4882dd 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/commit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/commit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ##CommitAction.java
 CTL_MenuItem_Commit = \u30b3\u30df\u30c3\u30c8(&M)...
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/create/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/create/Bundle_ja.properties
index 915edc0..e10841f 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/create/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/create/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_MenuItem_Create=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u521d\u671f\u5316(&N)...
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/diff/Bundle_ja.properties
index 42038db..e1f786b 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/diff/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_ApplyDiffPatchBrowseFolder=\u30d1\u30c3\u30c1\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u53c2\u7167\u3067\u304d\u307e\u3059\u3002
 ## DiffTopComponent.java
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/ignore/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/ignore/Bundle_ja.properties
index b6318c2..86858c2 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/ignore/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/ignore/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Ignore=\u7121\u8996\u3092\u5207\u66ff\u3048(&I)
 ##IgnoreAction.java
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/log/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/log/Bundle_ja.properties
index bb8ebbe..876f232 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/log/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/log/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Action.ViewCurrent.name=\u73fe\u5728\u306e\u8868\u793a
 ##LogAction.java
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/menu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/menu/Bundle_ja.properties
index 7982ee4..2d250f3 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/menu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/menu/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_MenuItem_BranchMenu=\u5206\u5c90/\u30bf\u30b0(&B)
 CTL_MenuItem_BranchMenu.popupName=\u5206\u5c90/\u30bf\u30b0
 CTL_MenuItem_ConflictsMenu=\u7af6\u5408(&F)
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/merge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/merge/Bundle_ja.properties
index 6f3e644..95105b9 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/merge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/merge/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Merge=\u5909\u66f4\u3092\u30de\u30fc\u30b8(&M)
 ##MergeAction.java
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/properties/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/properties/Bundle_ja.properties
index 534f724..2053e00 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/properties/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/properties/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Properties=\u30d7\u30ed\u30d1\u30c6\u30a3(&O)...
 CTL_PropertiesDialog_Title=Hg\u30d7\u30ed\u30d1\u30c6\u30a3\u30fb\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/pull/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/pull/Bundle_ja.properties
index fcc91e1..2a12699 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/pull/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/pull/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_FetchLocal=\u30d5\u30a7\u30c3\u30c1(&F)
 # {0} - repository folder name
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/push/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/push/Bundle_ja.properties
index ec6dda7..6f13310 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/push/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/push/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_PushBranchLocal=\u73fe\u5728\u306e\u5206\u5c90\u3092\u30d7\u30c3\u30b7\u30e5(&S)
 # {0} - repository folder name
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/queues/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/queues/Bundle_ja.properties
index 95df9ad..df18177 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/queues/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/queues/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_QCreatePatch=\u30d1\u30c3\u30c1\u306e\u4f5c\u6210(&C)...
 CTL_MenuItem_QDiff=\u5dee\u5206(&D)
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rebase/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rebase/Bundle_ja.properties
index 307976a..9607a90 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rebase/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rebase/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_RebaseAction=\u30ea\u30d9\u30fc\u30b9(&R)...
 CTL_RebaseAction.abortButton.text=\u4e2d\u65ad(&R)
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/repository/Bundle_ja.properties
index 66f9352..88aebea 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/repository/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_HeadRevisionPicker_Cancel=\u53d6\u6d88
 ACSD_HeadRevisionPicker_Select=\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rollback/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rollback/Bundle_ja.properties
index e92c94d..294878c 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rollback/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/rollback/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ##BackoutAction.java
 CTL_MenuItem_Backout = \u30d0\u30c3\u30af\u30a2\u30a6\u30c8(&B)...
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/shelve/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/shelve/Bundle_ja.properties
index 6a89ac8..2335dd2 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/shelve/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/shelve/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ShelveChanges_Title = \u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6(&S)...
 CTL_ShelveChanges_Title_Context = \u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6(&S)...
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/status/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/status/Bundle_ja.properties
index cf44cdc..757cf1b 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/status/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/status/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Versioning_TopComponent_Title = Mercurial
 CTL_Versioning_TopComponent_MultiTitle = Mercurial - {0} {1}
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/tag/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/tag/Bundle_ja.properties
index a178157..989c105 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/tag/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/tag/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_CreateTag=\u30bf\u30b0\u3092\u4f5c\u6210(&T)...
 CTL_MenuItem_ManageTags=\u30bf\u30b0\u306e\u7ba1\u7406(&G)...
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/update/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/update/Bundle_ja.properties
index 357f501..3874174 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/update/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/update/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_MarkResolved=\u89e3\u6c7a\u3068\u3057\u3066\u30de\u30fc\u30af(&M)
 CTL_MenuItem_Resolve=\u7af6\u5408\u3092\u89e3\u6c7a(&F)
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/view/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/view/Bundle_ja.properties
index be3e109..45caabc 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/view/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/view/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ##ViewAction.java
 CTL_MenuItem_View = \u8868\u793a(&V)...
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/wizards/Bundle_ja.properties
index db9563c..c801b6a 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 repositoryPanel.Name=Mercurial\u30ea\u30dd\u30b8\u30c8\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/util/Bundle_ja.properties
index 139f80f..2469419 100755
--- a/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mercurial/mercurial/org/netbeans/modules/mercurial/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_WARN_NO_VIEW_TEXT = hg: \u4e0d\u660e\u306a\u30b3\u30de\u30f3\u30c9'view'\n .hgrc\u306e\u62e1\u5f35\u30bb\u30af\u30b7\u30e7\u30f3\u306b"hgext.hgk="\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u304b?
 MSG_WARN_HGK_NOT_FOUND_TEXT = sh: hgk\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\n hgk\u306e\u5834\u6240\u304c\u30d1\u30b9\u306b\u5b58\u5728\u3057\u307e\u3059\u304b?
diff --git a/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/Bundle_ja.properties
index c7a6941..fc1615e 100755
--- a/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_LocalTaskRepository.displayName=\u30ed\u30fc\u30ab\u30eb\u30fb\u30bf\u30b9\u30af
 MSG_NewTaskSummary=\u65b0\u898f\u672a\u9001\u4fe1\u30bf\u30b9\u30af
diff --git a/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/localtasks/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/localtasks/Bundle_ja.properties
index 8945d82..495c36b 100755
--- a/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/localtasks/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/localtasks/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_IssueField.attachments=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb
 LBL_IssueField.references=\u53c2\u7167
 LBL_IssueField.summary=\u30b5\u30de\u30ea\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/wiki/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/wiki/Bundle_ja.properties
index cb45b83..dba1b10 100755
--- a/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/wiki/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/mylyn-util/mylyn-util/org/netbeans/modules/mylyn/util/wiki/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2012 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TOOL_Preview=\u30d7\u30ec\u30d3\u30e5\u30fc\u306e\u8868\u793a
 TOOL_Edit=\u30bd\u30fc\u30b9\u306e\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/Bundle_ja.properties
index 31066d4..9fe3d83 100755
--- a/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #display name of the module category
 OpenIDE-Module-Display-Category=\u901a\u77e5
 #name of the module
diff --git a/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/center/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/center/Bundle_ja.properties
index 6e2dfbe..d10cb72 100755
--- a/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/center/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/center/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_NotificationPriority=\u512a\u5148\u5ea6
 LBL_NotificationTimestamp=\u4f5c\u6210\u65e5
diff --git a/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/filter/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/filter/Bundle_ja.properties
index e52da82..a7c16e9 100755
--- a/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/filter/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/notifications/notifications/org/netbeans/modules/notifications/filter/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 no-filter=\u30d5\u30a3\u30eb\u30bf\u306a\u3057
 error-filter=\u30a8\u30e9\u30fc\u306e\u307f
diff --git a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/colors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/colors/Bundle_ja.properties
index 1b110ba..27af318 100755
--- a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/colors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/colors/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #FontAndColorsPanel
diff --git a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/Bundle_ja.properties
index bee092d..2579b0c 100755
--- a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u306e\u30aa\u30d7\u30b7\u30e7\u30f3
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/completion/Bundle_ja.properties
index 5d30aca..926524c 100755
--- a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #CodeCompletion options subcategory
 CTL_CodeCompletion_DisplayName=\u30b3\u30fc\u30c9\u88dc\u5b8c
diff --git a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/keymap/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/keymap/Bundle_ja.properties
index 34baff4..cf4f2e8 100755
--- a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/keymap/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/keymap/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30ad\u30fc\u30de\u30c3\u30d7\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3
 
diff --git a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/onsave/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/onsave/Bundle_ja.properties
index 04e01fd..6d79f0b 100755
--- a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/onsave/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/editor/onsave/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_OnSave_DisplayName=\u4fdd\u5b58\u6642
 CTL_OnSave_ToolTip=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u4fdd\u5b58\u6642\u306b\u5b9f\u884c\u3055\u308c\u305f\u30a2\u30af\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/generaleditor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/generaleditor/Bundle_ja.properties
index e53a28d..31b9fb5 100755
--- a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/generaleditor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/generaleditor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #GeneralEditorPanel
diff --git a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/indentation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/indentation/Bundle_ja.properties
index 203b15c..727e291 100755
--- a/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/indentation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/options-editor/options-editor/org/netbeans/modules/options/indentation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #Tools-Options -> Editor -> Formatting customizer
diff --git a/netbeans-l10n-zip/src/ja/ide/org-apache-xml-resolver/org-apache-xml-resolver/org/apache/xml/resolver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-apache-xml-resolver/org-apache-xml-resolver/org/apache/xml/resolver/Bundle_ja.properties
index 0fba4c8..63784ac 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-apache-xml-resolver/org-apache-xml-resolver/org/apache/xml/resolver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-apache-xml-resolver/org-apache-xml-resolver/org/apache/xml/resolver/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Apache Resolver\u30e9\u30a4\u30d6\u30e9\u30ea1.2
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-debugger/org-netbeans-api-debugger/org/netbeans/api/debugger/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-debugger/org-netbeans-api-debugger/org/netbeans/api/debugger/Bundle_ja.properties
index 3896e8c..99f3bd0 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-debugger/org-netbeans-api-debugger/org/netbeans/api/debugger/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-debugger/org-netbeans-api-debugger/org/netbeans/api/debugger/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_CanNotSaveSettings=\u30c7\u30d0\u30c3\u30ac\u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3002
 OpenIDE-Module-Name=\u30c7\u30d0\u30c3\u30ac\u30fb\u30b3\u30a2API
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-java-classpath/org-netbeans-api-java-classpath/org/netbeans/api/java/classpath/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-java-classpath/org-netbeans-api-java-classpath/org/netbeans/api/java/classpath/Bundle_ja.properties
index e5b24ce..f0168cc 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-java-classpath/org-netbeans-api-java-classpath/org/netbeans/api/java/classpath/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-java-classpath/org-netbeans-api-java-classpath/org/netbeans/api/java/classpath/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=\u305d\u308c\u3089\u306e(\u30bd\u30fc\u30b9)\u30eb\u30fc\u30c8\u304a\u3088\u3073\u64cd\u4f5c\u306e\u4e00\u89a7\u3092\u793a\u3059\u30af\u30e9\u30b9\u30d1\u30b9\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30af\u30e9\u30b9\u30d1\u30b9API
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-knockout/org-netbeans-api-knockout/org/netbeans/spi/knockout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-knockout/org-netbeans-api-knockout/org/netbeans/spi/knockout/Bundle_ja.properties
index 806e8be..5d02b4b 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-knockout/org-netbeans-api-knockout/org/netbeans/spi/knockout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-knockout/org-netbeans-api-knockout/org/netbeans/spi/knockout/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Knockout\u30e2\u30c7\u30eb\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0API
 
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml-ui/org-netbeans-api-xml-ui/org/netbeans/api/xml/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml-ui/org-netbeans-api-xml-ui/org/netbeans/api/xml/ui/Bundle_ja.properties
index 577dedd..6d9964e 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml-ui/org-netbeans-api-xml-ui/org/netbeans/api/xml/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml-ui/org-netbeans-api-xml-ui/org/netbeans/api/xml/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=XML
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u306fXML\u30c4\u30fc\u30ebAPI\u306eUI\u90e8\u5206\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u4ed6\u306eAPI\u5b9f\u88c5\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30b5\u30dd\u30fc\u30c8\u3059\u308b\u305f\u3081\u306bSPI\u3082\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=XML\u30c4\u30fc\u30ebAPI UI
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml-ui/org-netbeans-api-xml-ui/org/netbeans/spi/xml/cookies/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml-ui/org-netbeans-api-xml-ui/org/netbeans/spi/xml/cookies/Bundle_ja.properties
index 825ca52..6ff4899 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml-ui/org-netbeans-api-xml-ui/org/netbeans/spi/xml/cookies/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml-ui/org-netbeans-api-xml-ui/org/netbeans/spi/xml/cookies/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## TestXMLSupport.java
 MSG_cannot_create_parser=\u30d1\u30fc\u30b5\u30fc\u3092\u6b63\u3057\u3044\u69cb\u6210\u3067\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/api/xml/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/api/xml/resources/Bundle_ja.properties
index 1770004..8228587 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/api/xml/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/api/xml/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## xml/api/manifest.mf
 OpenIDE-Module-Name=XML\u30c4\u30fc\u30ebAPI
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/api/xml/resources/XML_ja.html b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/api/xml/resources/XML_ja.html
index 80f70bd..0a5fd44 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/api/xml/resources/XML_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/api/xml/resources/XML_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <HTML>
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/spi/xml/cookies/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/spi/xml/cookies/Bundle_ja.properties
index 825ca52..6ff4899 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/spi/xml/cookies/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-api-xml/org-netbeans-api-xml/org/netbeans/spi/xml/cookies/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## TestXMLSupport.java
 MSG_cannot_create_parser=\u30d1\u30fc\u30b5\u30fc\u3092\u6b63\u3057\u3044\u69cb\u6210\u3067\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser-webview/org-netbeans-core-browser-webview/org/netbeans/core/browser/webview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser-webview/org-netbeans-core-browser-webview/org/netbeans/core/browser/webview/Bundle_ja.properties
index d81cb4d..0b77785 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser-webview/org-netbeans-core-browser-webview/org/netbeans/core/browser/webview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser-webview/org-netbeans-core-browser-webview/org/netbeans/core/browser/webview/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=<html>\u57cb\u8fbc\u307f\u30d6\u30e9\u30a6\u30b6\u5b9f\u88c5\u306f\u3001JavaFX\u30e9\u30f3\u30bf\u30a4\u30e0\u306eWebView\u30d9\u30fc\u30b9\u3067\u3059\u3002
 OpenIDE-Module-Name=\u57cb\u8fbc\u307f\u30d6\u30e9\u30a6\u30b6UI - JavaFX WebView
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser-webview/org-netbeans-core-browser-webview/org/netbeans/core/browser/webview/ext/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser-webview/org-netbeans-core-browser-webview/org/netbeans/core/browser/webview/ext/Bundle_ja.properties
index 7575767..6bf42a4 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser-webview/org-netbeans-core-browser-webview/org/netbeans/core/browser/webview/ext/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser-webview/org-netbeans-core-browser-webview/org/netbeans/core/browser/webview/ext/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 WebBrowserImpl.inspectPage=\u30da\u30fc\u30b8\u306e\u691c\u67fb
 Err_InvalidURL={0}\u3092\u958b\u3051\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser/org-netbeans-core-browser/org/netbeans/core/browser/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser/org-netbeans-core-browser/org/netbeans/core/browser/api/Bundle_ja.properties
index 31599fc..ca1abff 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser/org-netbeans-core-browser/org/netbeans/core/browser/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-browser/org-netbeans-core-browser/org/netbeans/core/browser/api/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Name=\u7d44\u8fbc\u307f\u30d6\u30e9\u30a6\u30b6
 
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/Bundle_ja.properties
index c6b60ca..3831ee7 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ServicesTabAction=\u30b5\u30fc\u30d3\u30b9(&S)
 LBL_Services=\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/resources/Bundle_ja.properties
index e5eb137..51bed62 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-ide/org-netbeans-core-ide/org/netbeans/core/ide/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30b3\u30a2 - IDE
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-multitabs-project/org-netbeans-core-multitabs-project/org/netbeans/core/multitabs/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-multitabs-project/org-netbeans-core-multitabs-project/org/netbeans/core/multitabs/project/Bundle_ja.properties
index 7b07ff2..652093c 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-multitabs-project/org-netbeans-core-multitabs-project/org/netbeans/core/multitabs/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-core-multitabs-project/org-netbeans-core-multitabs-project/org/netbeans/core/multitabs/project/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30bf\u30d6\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5f53\u305f\u308a\u306e\u80cc\u666f\u8272\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30de\u30eb\u30c1\u30bf\u30d6\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d6\u30ea\u30c3\u30b8
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/Bundle_ja.properties
index 6ae179c..cd402f2 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30a8\u30df\u30e5\u30ec\u30fc\u30bf
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/support/Bundle_ja.properties
index cabc294..1e2721b 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-lib-terminalemulator/org-netbeans-lib-terminalemulator/org/netbeans/lib/terminalemulator/support/Bundle_ja.properties
@@ -1,41 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # FindBar
 #
 CTL_Next=\u6b21
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-antlr3-runtime/org-netbeans-libs-antlr3-runtime/org/netbeans/libs/antlr3/runtime/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-antlr3-runtime/org-netbeans-libs-antlr3-runtime/org/netbeans/libs/antlr3/runtime/Bundle_ja.properties
index b632ab7..58f40a5 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-antlr3-runtime/org-netbeans-libs-antlr3-runtime/org/netbeans/libs/antlr3/runtime/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-antlr3-runtime/org-netbeans-libs-antlr3-runtime/org/netbeans/libs/antlr3/runtime/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Name=Antlr 3.3\u30e9\u30f3\u30bf\u30a4\u30e0
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-antlr4-runtime/org-netbeans-libs-antlr4-runtime/org/netbeans/libs/antlr4/runtime/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-antlr4-runtime/org-netbeans-libs-antlr4-runtime/org/netbeans/libs/antlr4/runtime/Bundle_ja.properties
index 409d60f..6f56492 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-antlr4-runtime/org-netbeans-libs-antlr4-runtime/org/netbeans/libs/antlr4/runtime/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-antlr4-runtime/org-netbeans-libs-antlr4-runtime/org/netbeans/libs/antlr4/runtime/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Name=Antlr 4.5\u30e9\u30f3\u30bf\u30a4\u30e0
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-bytelist/org-netbeans-libs-bytelist/org/netbeans/libs/bytelist/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-bytelist/org-netbeans-libs-bytelist/org/netbeans/libs/bytelist/Bundle_ja.properties
index 74f28b2..e22ca94 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-bytelist/org-netbeans-libs-bytelist/org/netbeans/libs/bytelist/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-bytelist/org-netbeans-libs-bytelist/org/netbeans/libs/bytelist/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JRuby ByteList
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-commons_compress/org-netbeans-libs-commons_compress/org/netbeans/libs/commons_compress/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-commons_compress/org-netbeans-libs-commons_compress/org/netbeans/libs/commons_compress/Bundle_ja.properties
index 4ba58b4..7ab8e59 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-commons_compress/org-netbeans-libs-commons_compress/org/netbeans/libs/commons_compress/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-commons_compress/org-netbeans-libs-commons_compress/org/netbeans/libs/commons_compress/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Commons Comppress\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-commons_net/org-netbeans-libs-commons_net/org/netbeans/libs/commons_net/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-commons_net/org-netbeans-libs-commons_net/org/netbeans/libs/commons_net/Bundle_ja.properties
index 4eac8b0..bdcc886 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-commons_net/org-netbeans-libs-commons_net/org/netbeans/libs/commons_net/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-commons_net/org-netbeans-libs-commons_net/org/netbeans/libs/commons_net/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Commons Net\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-freemarker/org-netbeans-libs-freemarker/org/netbeans/libs/freemarker/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-freemarker/org-netbeans-libs-freemarker/org/netbeans/libs/freemarker/Bundle_ja.properties
index 0f5c0a7..4f57cec 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-freemarker/org-netbeans-libs-freemarker/org/netbeans/libs/freemarker/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-freemarker/org-netbeans-libs-freemarker/org/netbeans/libs/freemarker/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Freemarker\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_ja.properties
index e1790b6..e388eb1 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/svnclientadapter/manifest.mf
 OpenIDE-Module-Name=Git\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/Bundle_ja.properties
index b393008..8e3c6de 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Exception_IdNotACommit = \u6307\u5b9a\u3055\u308c\u305fID [{0}]\u306f\u30b3\u30df\u30c3\u30c8\u307e\u305f\u306f\u6ce8\u91c8\u306e\u3042\u308b\u30bf\u30b0\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 MSG_Exception_IdNotUnique = \u6307\u5b9a\u3055\u308c\u305fobjectId [{0}]\u306f\u4e00\u610f\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/commands/Bundle_ja.properties
index f4248a5..024c219 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/commands/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Warning_IndexEntryExists = \u7d22\u5f15\u306b\u306f\u3059\u3067\u306b{0}\u306e\u30a8\u30f3\u30c8\u30ea\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
 MSG_Exception_CannotUpdateHead = {0}\u3078\u306eHEAD\u53c2\u7167\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/utils/Bundle_ja.properties
index 7517e2c..9a7e357 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/jgit/utils/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Warning_ReplacingDirectory = \u30c7\u30a3\u30ec\u30af\u30c8\u30ea{0}\u3092\u7f6e\u63db\u3057\u3066\u3044\u307e\u3059
 MSG_Warning_ReplacingFile = \u30d5\u30a1\u30a4\u30eb{0}\u3092\u7f6e\u63db\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-ini4j/org-netbeans-libs-ini4j/org/netbeans/libs/ini4j/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-ini4j/org-netbeans-libs-ini4j/org/netbeans/libs/ini4j/Bundle_ja.properties
index c298e99..be1b40e 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-ini4j/org-netbeans-libs-ini4j/org/netbeans/libs/ini4j/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-ini4j/org-netbeans-libs-ini4j/org/netbeans/libs/ini4j/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/svnclientadapter/manifest.mf
 OpenIDE-Module-Name=ini4j
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jaxb/org-netbeans-libs-jaxb/org/netbeans/libs/jaxb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jaxb/org-netbeans-libs-jaxb/org/netbeans/libs/jaxb/Bundle_ja.properties
index 20c050d..e9392d2 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jaxb/org-netbeans-libs-jaxb/org/netbeans/libs/jaxb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jaxb/org-netbeans-libs-jaxb/org/netbeans/libs/jaxb/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Name=JAXB 2.2\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jsch-agentproxy/org-netbeans-libs-jsch-agentproxy/org/netbeans/libs/jsch/agentproxy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jsch-agentproxy/org-netbeans-libs-jsch-agentproxy/org/netbeans/libs/jsch/agentproxy/Bundle_ja.properties
index 85bd17e..b675204 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jsch-agentproxy/org-netbeans-libs-jsch-agentproxy/org/netbeans/libs/jsch/agentproxy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jsch-agentproxy/org-netbeans-libs-jsch-agentproxy/org/netbeans/libs/jsch/agentproxy/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JSch\u30a8\u30fc\u30b8\u30a7\u30f3\u30c8\u30fb\u30d7\u30ed\u30ad\u30b7\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-json_simple/org-netbeans-libs-json_simple/org/netbeans/libs/json_simple/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-json_simple/org-netbeans-libs-json_simple/org/netbeans/libs/json_simple/Bundle_ja.properties
index 288be2b..3b517a6 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-json_simple/org-netbeans-libs-json_simple/org/netbeans/libs/json_simple/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-json_simple/org-netbeans-libs-json_simple/org/netbeans/libs/json_simple/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Name=JSON Simple\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jvyamlb/org-netbeans-libs-jvyamlb/org/netbeans/libs/jvyamlb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jvyamlb/org-netbeans-libs-jvyamlb/org/netbeans/libs/jvyamlb/Bundle_ja.properties
index 8caccb3..9c644de 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jvyamlb/org-netbeans-libs-jvyamlb/org/netbeans/libs/jvyamlb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-jvyamlb/org-netbeans-libs-jvyamlb/org/netbeans/libs/jvyamlb/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=YAML\u30d1\u30fc\u30b5\u30fc\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea(jvyamlb)
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-lucene/org-netbeans-libs-lucene/org/netbeans/libs/lucene/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-lucene/org-netbeans-libs-lucene/org/netbeans/libs/lucene/Bundle_ja.properties
index 0d8a171..32115e7 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-lucene/org-netbeans-libs-lucene/org/netbeans/libs/lucene/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-lucene/org-netbeans-libs-lucene/org/netbeans/libs/lucene/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/lucene/manifest.mf
 OpenIDE-Module-Name=Lucene\u7d71\u5408
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-nashorn/org-netbeans-libs-nashorn/org/netbeans/libs/nashorn/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-nashorn/org-netbeans-libs-nashorn/org/netbeans/libs/nashorn/Bundle_ja.properties
index 13fdc00..144b2c5 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-nashorn/org-netbeans-libs-nashorn/org/netbeans/libs/nashorn/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-nashorn/org-netbeans-libs-nashorn/org/netbeans/libs/nashorn/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Nashorn\u7d71\u5408
 
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-smack/org-netbeans-libs-smack/org/netbeans/libs/smack/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-smack/org-netbeans-libs-smack/org/netbeans/libs/smack/Bundle_ja.properties
index c0ac76a..c960de5 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-smack/org-netbeans-libs-smack/org/netbeans/libs/smack/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-smack/org-netbeans-libs-smack/org/netbeans/libs/smack/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Long-Description=Smack\u306f\u3001\u30a4\u30f3\u30b9\u30bf\u30f3\u30c8\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u30d7\u30ec\u30bc\u30f3\u30b9\u7528\u306e\u30aa\u30fc\u30d7\u30f3\u30fb\u30bd\u30fc\u30b9XMPP (Jabber)\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u3067\u3059\u3002
 OpenIDE-Module-Name=Smack API
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter-javahl/org-netbeans-libs-svnClientAdapter-javahl/org/netbeans/libs/svnclientadapter/javahl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter-javahl/org-netbeans-libs-svnClientAdapter-javahl/org/netbeans/libs/svnclientadapter/javahl/Bundle_ja.properties
index 0e5f9b6..ee47c78 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter-javahl/org-netbeans-libs-svnClientAdapter-javahl/org/netbeans/libs/svnclientadapter/javahl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter-javahl/org-netbeans-libs-svnClientAdapter-javahl/org/netbeans/libs/svnclientadapter/javahl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/svnclientadapter/manifest.mf
 OpenIDE-Module-Name=Subversion JavaHL\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter-svnkit/org-netbeans-libs-svnClientAdapter-svnkit/org/netbeans/libs/svnclientadapter/svnkit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter-svnkit/org-netbeans-libs-svnClientAdapter-svnkit/org/netbeans/libs/svnclientadapter/svnkit/Bundle_ja.properties
index 6c709ba..19d1116 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter-svnkit/org-netbeans-libs-svnClientAdapter-svnkit/org/netbeans/libs/svnclientadapter/svnkit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter-svnkit/org-netbeans-libs-svnClientAdapter-svnkit/org/netbeans/libs/svnclientadapter/svnkit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/svnclientadapter/manifest.mf
 OpenIDE-Module-Name=Subversion SvnKit\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter/org-netbeans-libs-svnClientAdapter/org/netbeans/libs/svnclientadapter/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter/org-netbeans-libs-svnClientAdapter/org/netbeans/libs/svnclientadapter/Bundle_ja.properties
index 45d00ad..2c7937f 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter/org-netbeans-libs-svnClientAdapter/org/netbeans/libs/svnclientadapter/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-svnClientAdapter/org-netbeans-libs-svnClientAdapter/org/netbeans/libs/svnclientadapter/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/svnclientadapter/manifest.mf
 OpenIDE-Module-Name=Subversion\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-swingx/org-netbeans-libs-swingx/org/netbeans/libs/swingx/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-swingx/org-netbeans-libs-swingx/org/netbeans/libs/swingx/Bundle_ja.properties
index 77d5076..fb0902d 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-swingx/org-netbeans-libs-swingx/org/netbeans/libs/swingx/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-swingx/org-netbeans-libs-swingx/org/netbeans/libs/swingx/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/swing-layout/manifest.mf
 OpenIDE-Module-Name=SwingX
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-xerces/org-netbeans-libs-xerces/org/netbeans/libs/xerces/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-xerces/org-netbeans-libs-xerces/org/netbeans/libs/xerces/Bundle_ja.properties
index 924ecb8..56c2957 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-xerces/org-netbeans-libs-xerces/org/netbeans/libs/xerces/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-libs-xerces/org-netbeans-libs-xerces/org/netbeans/libs/xerces/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/xerces/manifest.mf
 OpenIDE-Module-Name=Xerces\u7d71\u5408
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/resources/Bundle_ja.properties
index 7daaf25..e6c79ef 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_Debugging_workspace=\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/Bundle_ja.properties
index 030df47..a6bef15 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30c7\u30d0\u30c3\u30ac\u30fb\u30b3\u30a2UI
 OpenIDE-Module-Display-Category=\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/actions/Bundle_ja.properties
index 7b00f18..cf5586d 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #ConnectorPanel
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/annotations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/annotations/Bundle_ja.properties
index 26cd5c2..e0bd301 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/annotations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/annotations/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TOOLTIP_WATCH_PIN=\u30a6\u30a9\u30c3\u30c1
 
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/eval/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/eval/Bundle_ja.properties
index d6651c8..e25b1aa 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/eval/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/eval/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CodeEvaluator
 CTL_Code_Evaluator_name=\u5f0f\u306e\u8a55\u4fa1
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/models/Bundle_ja.properties
index 2792f8c..d0b2a1e 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/models/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_ActivateAllBreakpoints=\u73fe\u5728\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3067\u3059\u3079\u3066\u306e\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u3092\u30a2\u30af\u30c6\u30a3\u30d6\u5316
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/Bundle_ja.properties
index 6f1727b..9783af1 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #SessionThreadRootNode
 CTL_ThreadRootNode=\u30b9\u30ec\u30c3\u30c9
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/debugging/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/debugging/Bundle_ja.properties
index af61fcc..5082fc7 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/debugging/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/modules/debugger/ui/views/debugging/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #DebuggingView
 CTL_Debugging_view=\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/spi/debugger/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/spi/debugger/ui/Bundle_ja.properties
index ff1581b..f42b1f0 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/spi/debugger/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-debugger-ui/org-netbeans-spi-debugger-ui/org/netbeans/spi/debugger/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # MethodChooser
 MSG_Step_Into_Method=\u30e1\u30bd\u30c3\u30c9\u306b\u30b9\u30c6\u30c3\u30d7\u30fb\u30a4\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/modules/editor/hints/projects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/modules/editor/hints/projects/Bundle_ja.properties
index 7a7bed0..eb4848d 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/modules/editor/hints/projects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/modules/editor/hints/projects/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30d2\u30f3\u30c8\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d6\u30ea\u30c3\u30b8
 
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/modules/editor/hints/projects/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/modules/editor/hints/projects/settings/Bundle_ja.properties
index 939827d..1637c27 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/modules/editor/hints/projects/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/modules/editor/hints/projects/settings/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d6\u30ea\u30c3\u30b8\u306b\u5bfe\u3059\u308b\u30a8\u30c7\u30a3\u30bf\u30fb\u30d2\u30f3\u30c8
 
 ProjectHintSettingPanel.browseSettingsFileLocation.text=\u53c2\u7167
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/spi/editor/hints/projects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/spi/editor/hints/projects/Bundle_ja.properties
index 6f54efa..1c48db6 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/spi/editor/hints/projects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/spi/editor/hints/projects/Bundle_ja.properties
@@ -1,42 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-# Copyright 2013 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
 PerProjectHintsPanelUI.jLabel2.text=\u691c\u7d22(&S):
 
 
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/spi/editor/hints/projects/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/spi/editor/hints/projects/support/Bundle_ja.properties
index 48ec5ff..f974c82 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/spi/editor/hints/projects/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints-projects/org-netbeans-spi-editor-hints-projects/org/netbeans/spi/editor/hints/projects/support/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2013 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]"
-
-# 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.
-
-# Contributor(s):
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CAP_Hints=\u30d2\u30f3\u30c8
 CAP_ProjectSpecificOptions=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u56fa\u6709\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints/org-netbeans-spi-editor-hints/org/netbeans/modules/editor/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints/org-netbeans-spi-editor-hints/org/netbeans/modules/editor/hints/Bundle_ja.properties
index 807be9d..dc86f71 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints/org-netbeans-spi-editor-hints/org/netbeans/modules/editor/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints/org-netbeans-spi-editor-hints/org/netbeans/modules/editor/hints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 HINT_Bulb=Alt-Enter\u30ad\u30fc\u3092\u62bc\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints/org-netbeans-spi-editor-hints/org/netbeans/modules/editor/hints/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints/org-netbeans-spi-editor-hints/org/netbeans/modules/editor/hints/resources/Bundle_ja.properties
index ad8ad63..a50a542 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints/org-netbeans-spi-editor-hints/org/netbeans/modules/editor/hints/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-editor-hints/org-netbeans-spi-editor-hints/org/netbeans/modules/editor/hints/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30d2\u30f3\u30c8
 OpenIDE-Module-Display-Category=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-navigator/org-netbeans-spi-navigator/org/netbeans/modules/navigator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-navigator/org-netbeans-spi-navigator/org/netbeans/modules/navigator/Bundle_ja.properties
index 568f547..f2b7054 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-navigator/org-netbeans-spi-navigator/org/netbeans/modules/navigator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-navigator/org-netbeans-spi-navigator/org/netbeans/modules/navigator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Navigator=\u30ca\u30d3\u30b2\u30fc\u30bf
 FMT_Navigator={0} - \u30ca\u30d3\u30b2\u30fc\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-navigator/org-netbeans-spi-navigator/org/netbeans/modules/navigator/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-navigator/org-netbeans-spi-navigator/org/netbeans/modules/navigator/resources/Bundle_ja.properties
index c49adc6..2e05538 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-navigator/org-netbeans-spi-navigator/org/netbeans/modules/navigator/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-navigator/org-netbeans-spi-navigator/org/netbeans/modules/navigator/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30ca\u30d3\u30b2\u30fc\u30bfAPI
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/Bundle_ja.properties
index fdf27e4..9cd69a0 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Palette Action display name
 CTL_Component_palette=\u30d1\u30ec\u30c3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/resources/Bundle_ja.properties
index 63754b9..7de5057 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u5171\u901a\u30d1\u30ec\u30c3\u30c8
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/ui/Bundle_ja.properties
index 834709e..8f0f0b7 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-palette/org-netbeans-spi-palette/org/netbeans/modules/palette/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 Err_CannotLoadIconFromFile=\u6b21\u304b\u3089\u306e\u30a2\u30a4\u30b3\u30f3\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093: {0}
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-tasklist/org-netbeans-spi-tasklist/org/netbeans/modules/tasklist/trampoline/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-tasklist/org-netbeans-spi-tasklist/org/netbeans/modules/tasklist/trampoline/Bundle_ja.properties
index 274457f..bad1006 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-tasklist/org-netbeans-spi-tasklist/org/netbeans/modules/tasklist/trampoline/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-tasklist/org-netbeans-spi-tasklist/org/netbeans/modules/tasklist/trampoline/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 HINT_UnknownGroup=\u4e0d\u660e\u306a\u30bf\u30b9\u30af\u30fb\u30b0\u30eb\u30fc\u30d7
 LBL_UnknownGroup=\u4e0d\u660e
 
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-tasklist/org-netbeans-spi-tasklist/org/netbeans/spi/tasklist/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-tasklist/org-netbeans-spi-tasklist/org/netbeans/spi/tasklist/Bundle_ja.properties
index e190319..9859449 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-tasklist/org-netbeans-spi-tasklist/org/netbeans/spi/tasklist/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-tasklist/org-netbeans-spi-tasklist/org/netbeans/spi/tasklist/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8
 OpenIDE-Module-Long-Description=\u300c\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u3055\u307e\u3056\u307e\u306a\u554f\u984c(Java\u30a8\u30e9\u30fc\u3001\u8b66\u544a\u3001TODO\u306a\u3069)\u3092\u8868\u793a\u3059\u308b\u3001\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8\u30fb\u30d7\u30e9\u30b0\u30a4\u30f3\u306bAPI\u3092\u63d0\u4f9b
 OpenIDE-Module-Name=\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8API
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-viewmodel/org-netbeans-spi-viewmodel/org/netbeans/modules/viewmodel/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-viewmodel/org-netbeans-spi-viewmodel/org/netbeans/modules/viewmodel/Bundle_ja.properties
index 05c495c..880e39e 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-viewmodel/org-netbeans-spi-viewmodel/org/netbeans/modules/viewmodel/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-spi-viewmodel/org-netbeans-spi-viewmodel/org/netbeans/modules/viewmodel/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=TreeTableView\u30e2\u30c7\u30eb
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/org-netbeans-swing-dirchooser/org-netbeans-swing-dirchooser/org/netbeans/swing/dirchooser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-netbeans-swing-dirchooser/org-netbeans-swing-dirchooser/org/netbeans/swing/dirchooser/Bundle_ja.properties
index 3c5f1ec..5ba04db 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-netbeans-swing-dirchooser/org-netbeans-swing-dirchooser/org/netbeans/swing/dirchooser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-netbeans-swing-dirchooser/org-netbeans-swing-dirchooser/org/netbeans/swing/dirchooser/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Name=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fb\u30c1\u30e5\u30fc\u30b6
 OpenIDE-Module-Short-Description=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5c02\u7528\u30e2\u30fc\u30c9\u3067\u3001\u901a\u5e38\u306eSwing\u30d5\u30a1\u30a4\u30eb\u30fb\u30c1\u30e5\u30fc\u30b6\u3092\u7f6e\u304d\u63db\u3048\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/org-openidex-util/org-openidex-util/org/openidex/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-openidex-util/org-openidex-util/org/openidex/resources/Bundle_ja.properties
index ab60cde..dd3165a 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-openidex-util/org-openidex-util/org/openidex/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-openidex-util/org-openidex-util/org/openidex/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u975e\u63a8\u5968\u306e\u53e4\u3044\u691c\u7d22API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/org-openidex-util/org-openidex-util/org/openidex/search/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/org-openidex-util/org-openidex-util/org/openidex/search/Bundle_ja.properties
index 0b0d1fa..a2cb927 100755
--- a/netbeans-l10n-zip/src/ja/ide/org-openidex-util/org-openidex-util/org/openidex/search/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/org-openidex-util/org-openidex-util/org/openidex/search/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 EX_memory=\u73fe\u5728\u306e\u30e1\u30e2\u30ea\u30fc\u306e\u4e0a\u9650\u306b\u9054\u3057\u305f\u305f\u3081\u3001\u691c\u7d22\u3092\u4e2d\u6b62\u3057\u307e\u3057\u305f\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/parsing-api/parsing-api/org/netbeans/modules/parsing/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/parsing-api/parsing-api/org/netbeans/modules/parsing/impl/Bundle_ja.properties
index 8a89e40..e00cdde 100755
--- a/netbeans-l10n-zip/src/ja/ide/parsing-api/parsing-api/org/netbeans/modules/parsing/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/parsing-api/parsing-api/org/netbeans/modules/parsing/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u69cb\u6587\u89e3\u6790API
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
diff --git a/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/impl/indexing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/impl/indexing/Bundle_ja.properties
index 13a741e..d22940e 100755
--- a/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/impl/indexing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/impl/indexing/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 # RepositoryUpdater
diff --git a/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/impl/indexing/errors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/impl/indexing/errors/Bundle_ja.properties
index bca56e3..c252dcd 100755
--- a/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/impl/indexing/errors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/impl/indexing/errors/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_ProviderName=\u30b3\u30f3\u30d1\u30a4\u30e9\u30fb\u30a8\u30e9\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/indexing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/indexing/Bundle_ja.properties
index 0d1a20f..482665c 100755
--- a/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/indexing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/parsing-indexing/parsing-indexing/org/netbeans/modules/parsing/indexing/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u89e3\u6790API\u7d22\u5f15\u4ed8\u3051
 
diff --git a/netbeans-l10n-zip/src/ja/ide/parsing-lucene/parsing-lucene/org/netbeans/modules/parsing/lucene/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/parsing-lucene/parsing-lucene/org/netbeans/modules/parsing/lucene/Bundle_ja.properties
index 9bfdaeb..bb0e972 100755
--- a/netbeans-l10n-zip/src/ja/ide/parsing-lucene/parsing-lucene/org/netbeans/modules/parsing/lucene/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/parsing-lucene/parsing-lucene/org/netbeans/modules/parsing/lucene/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u4f5c\u6210\u3092\u5fc5\u8981\u3068\u3059\u308b\u30a8\u30c7\u30a3\u30bf\u6a5f\u80fd\u306e\u4e00\u822c\u7684\u306a\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u89e3\u6790API Lucene\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/parsing-nb/parsing-nb/org/netbeans/modules/parsing/nb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/parsing-nb/parsing-nb/org/netbeans/modules/parsing/nb/Bundle_ja.properties
index 528882a..86dfd8c 100755
--- a/netbeans-l10n-zip/src/ja/ide/parsing-nb/parsing-nb/org/netbeans/modules/parsing/nb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/parsing-nb/parsing-nb/org/netbeans/modules/parsing/nb/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u89e3\u6790API IDE\u30d6\u30ea\u30c3\u30b8
 
diff --git a/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/Bundle_ja.properties
index 059982f..9b7180a 100755
--- a/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/Bundle_ja.properties
@@ -1,42 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_IncompleteResults=\u5019\u88dc\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059...
 LBL_ScanningInProgress=\u30b9\u30ad\u30e3\u30f3\u4e2d...
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=\u69cb\u6587\u89e3\u6790\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3\u306eGUI\u3092\u4f5c\u6210\u3059\u308b\u305f\u3081\u306e\u69d8\u3005\u306a\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fb\u30af\u30e9\u30b9\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u89e3\u6790API UI
diff --git a/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/indexing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/indexing/Bundle_ja.properties
index b0c8513..2b46d04 100755
--- a/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/indexing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/indexing/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_RefreshAllIndexes=\u30e1\u30bf\u30c7\u30fc\u30bf\u306e\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
 ScanForExternalChanges_name=\u5916\u90e8\u5909\u66f4\u3092\u30b9\u30ad\u30e3\u30f3
 
diff --git a/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/indexing/errors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/indexing/errors/Bundle_ja.properties
index 3debf22..f709d0e 100755
--- a/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/indexing/errors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/parsing-ui/parsing-ui/org/netbeans/modules/parsing/ui/indexing/errors/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 TP_ErrorBadgeSingle=\u30d5\u30a1\u30a4\u30eb\u3092\u89e3\u6790\u3057\u3066\u3044\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 TP_ErrorBadgeFolder=\u30a8\u30e9\u30fc\u304c\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/print-editor/print-editor/org/netbeans/modules/print/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/print-editor/print-editor/org/netbeans/modules/print/editor/resources/Bundle_ja.properties
index 552d558..984bdaa 100755
--- a/netbeans-l10n-zip/src/ja/ide/print-editor/print-editor/org/netbeans/modules/print/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/print-editor/print-editor/org/netbeans/modules/print/editor/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest
 OpenIDE-Module-Name=\u30d7\u30ea\u30f3\u30c8\u30fb\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/project-ant-compat8/project-ant-compat8/org/netbeans/modules/project/ant/compat8/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-ant-compat8/project-ant-compat8/org/netbeans/modules/project/ant/compat8/Bundle_ja.properties
index 8c7c701..6215b8b 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-ant-compat8/project-ant-compat8/org/netbeans/modules/project/ant/compat8/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-ant-compat8/project-ant-compat8/org/netbeans/modules/project/ant/compat8/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=Ant\u30d9\u30fc\u30b9\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8\u306eNetBeans 8.0\u3068\u306e\u4e0b\u4f4d\u4e92\u63db\u6027
 OpenIDE-Module-Name=Ant\u30d9\u30fc\u30b9\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b5\u30dd\u30fc\u30c88.0\u306e\u4e92\u63db\u6027
diff --git a/netbeans-l10n-zip/src/ja/ide/project-ant-ui/project-ant-ui/org/netbeans/modules/project/ant/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-ant-ui/project-ant-ui/org/netbeans/modules/project/ant/ui/Bundle_ja.properties
index 1cee0fa..13e6e42 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-ant-ui/project-ant-ui/org/netbeans/modules/project/ant/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-ant-ui/project-ant-ui/org/netbeans/modules/project/ant/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FileChooserAccessory.noSuitableVariable=<\u9069\u5207\u306a\u5909\u6570\u306a\u3057>
 # {0} - sharable library location
diff --git a/netbeans-l10n-zip/src/ja/ide/project-ant-ui/project-ant-ui/org/netbeans/spi/project/support/ant/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-ant-ui/project-ant-ui/org/netbeans/spi/project/support/ant/ui/Bundle_ja.properties
index 637b772..9094922 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-ant-ui/project-ant-ui/org/netbeans/spi/project/support/ant/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-ant-ui/project-ant-ui/org/netbeans/spi/project/support/ant/ui/Bundle_ja.properties
@@ -1,46 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - name of license
 ERR_missing_license="{0}"\u3068\u3044\u3046\u540d\u524d\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30e9\u30a4\u30bb\u30f3\u30b9\u304c\u3001IDE\u306e\u30e9\u30a4\u30bb\u30f3\u30b9\u30fb\u30d8\u30c3\u30c0\u30fc\u306b\u3042\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 # {0} - path of license
 ERR_missing_license_path=\u30d1\u30b9"{0}"\u306b\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 # {0} - name of license
 ERR_missing_license_template=<"{0}"\u3068\u3044\u3046\u540d\u524d\u306e\u30e9\u30a4\u30f3\u30bb\u30f3\u30b9\u30fb\u30d8\u30c3\u30c0\u30fc\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u304c\u3042\u308a\u307e\u305b\u3093>
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 LicenseHeadersPanel.rbGlobal.text=\u30b0\u30ed\u30fc\u30d0\u30eb\u30fb\u30e9\u30a4\u30bb\u30f3\u30b9\u3092\u4f7f\u7528
 LicenseHeadersPanel.rbProject.text=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5834\u6240\u3092\u4f7f\u7528
 LicenseHeadersPanel.lblLicense.text=\u30e9\u30a4\u30bb\u30f3\u30b9\u30fb\u30d8\u30c3\u30c0\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/project-ant/project-ant/org/netbeans/modules/project/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-ant/project-ant/org/netbeans/modules/project/ant/Bundle_ja.properties
index 54f278f..1e6ce0c 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-ant/project-ant/org/netbeans/modules/project/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-ant/project-ant/org/netbeans/modules/project/ant/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Ant\u30d9\u30fc\u30b9\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/project-ant/project-ant/org/netbeans/spi/project/support/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-ant/project-ant/org/netbeans/spi/project/support/ant/Bundle_ja.properties
index 650e7be..622c0fb 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-ant/project-ant/org/netbeans/spi/project/support/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-ant/project-ant/org/netbeans/spi/project/support/ant/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # GeneratedFilesHelper
 # NOTE TO TRANSLATORS:
diff --git a/netbeans-l10n-zip/src/ja/ide/project-indexingbridge/project-indexingbridge/org/netbeans/modules/project/indexingbridge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-indexingbridge/project-indexingbridge/org/netbeans/modules/project/indexingbridge/Bundle_ja.properties
index e4586cb..c63e4f5 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-indexingbridge/project-indexingbridge/org/netbeans/modules/project/indexingbridge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-indexingbridge/project-indexingbridge/org/netbeans/modules/project/indexingbridge/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u7d22\u5f15\u30d6\u30ea\u30c3\u30b8
 
diff --git a/netbeans-l10n-zip/src/ja/ide/project-libraries-ui/project-libraries-ui/org/netbeans/api/project/libraries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-libraries-ui/project-libraries-ui/org/netbeans/api/project/libraries/Bundle_ja.properties
index e326d00..8aa3d4d 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-libraries-ui/project-libraries-ui/org/netbeans/api/project/libraries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-libraries-ui/project-libraries-ui/org/netbeans/api/project/libraries/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_Importing=\u30a4\u30f3\u30dd\u30fc\u30c8...
diff --git a/netbeans-l10n-zip/src/ja/ide/project-libraries-ui/project-libraries-ui/org/netbeans/modules/project/libraries/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-libraries-ui/project-libraries-ui/org/netbeans/modules/project/libraries/ui/Bundle_ja.properties
index e4a5c88..f11bb05 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-libraries-ui/project-libraries-ui/org/netbeans/modules/project/libraries/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-libraries-ui/project-libraries-ui/org/netbeans/modules/project/libraries/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_CreateLibrary=\u65b0\u898f\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/Bundle_ja.properties
index 6c5fc08..9b988c9 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_libraryCreatedError=\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u521d\u671f\u5316\u4e2d\u306b\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0\u306b\u3088\u3063\u3066\u3001\u6b21\u306e\u4f8b\u5916\u304c\u30b9\u30ed\u30fc\u3055\u308c\u307e\u3057\u305f\u3002\u4f5c\u6210\u3055\u308c\u305f\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u6b63\u3057\u304f\u6a5f\u80fd\u3057\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002
 MSG_libraryDeletedError=\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u524a\u9664\u4e2d\u306b\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0\u306b\u3088\u3063\u3066\u3001\u6b21\u306e\u4f8b\u5916\u304c\u30b9\u30ed\u30fc\u3055\u308c\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/resources/Bundle_ja.properties
index 46e0d59..1031449 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/modules/project/libraries/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Manifest localization
 OpenIDE-Module-Name=\u5916\u90e8\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/spi/project/libraries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/spi/project/libraries/Bundle_ja.properties
index c2fb1e6..3660425 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/spi/project/libraries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-libraries/project-libraries/org/netbeans/spi/project/libraries/Bundle_ja.properties
@@ -1,41 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_global=\u30b0\u30ed\u30fc\u30d0\u30eb\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/ide/project-spi-intern-impl/project-spi-intern-impl/org/netbeans/modules/project/spi/intern/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-spi-intern-impl/project-spi-intern-impl/org/netbeans/modules/project/spi/intern/impl/Bundle_ja.properties
index 3a7a871..9e7e8e6 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-spi-intern-impl/project-spi-intern-impl/org/netbeans/modules/project/spi/intern/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-spi-intern-impl/project-spi-intern-impl/org/netbeans/modules/project/spi/intern/impl/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8SPI Impl(\u5185\u90e8)
 TITLE_CannotWriteFile=\u30d5\u30a1\u30a4\u30eb\u306b\u66f8\u304d\u8fbc\u3081\u307e\u305b\u3093
 
diff --git a/netbeans-l10n-zip/src/ja/ide/project-spi-intern/project-spi-intern/org/netbeans/modules/project/spi/intern/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/project-spi-intern/project-spi-intern/org/netbeans/modules/project/spi/intern/Bundle_ja.properties
index 034872c..0259dee 100755
--- a/netbeans-l10n-zip/src/ja/ide/project-spi-intern/project-spi-intern/org/netbeans/modules/project/spi/intern/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/project-spi-intern/project-spi-intern/org/netbeans/modules/project/spi/intern/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8SPI(\u5185\u90e8)
 
diff --git a/netbeans-l10n-zip/src/ja/ide/projectapi-nb/projectapi-nb/org/netbeans/modules/projectapi/nb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectapi-nb/projectapi-nb/org/netbeans/modules/projectapi/nb/Bundle_ja.properties
index 6615854..181e3ca 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectapi-nb/projectapi-nb/org/netbeans/modules/projectapi/nb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectapi-nb/projectapi-nb/org/netbeans/modules/projectapi/nb/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8API\u306eNetBeans\u56fa\u6709\u306e\u5b9f\u88c5\u3002
 OpenIDE-Module-Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8API\u5b9f\u88c5
diff --git a/netbeans-l10n-zip/src/ja/ide/projectapi/projectapi/org/netbeans/api/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectapi/projectapi/org/netbeans/api/project/Bundle_ja.properties
index 991b23e..e539ade 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectapi/projectapi/org/netbeans/api/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectapi/projectapi/org/netbeans/api/project/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2007 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} = fileobject representing the project location
 # {1} = the actual project
diff --git a/netbeans-l10n-zip/src/ja/ide/projectapi/projectapi/org/netbeans/modules/projectapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectapi/projectapi/org/netbeans/modules/projectapi/Bundle_ja.properties
index a994dd2..6c86419 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectapi/projectapi/org/netbeans/modules/projectapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectapi/projectapi/org/netbeans/modules/projectapi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui-buildmenu/projectui-buildmenu/org/netbeans/modules/project/ui/buildmenu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectui-buildmenu/projectui-buildmenu/org/netbeans/modules/project/ui/buildmenu/Bundle_ja.properties
index 0b34d62..7ee6efa 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui-buildmenu/projectui-buildmenu/org/netbeans/modules/project/ui/buildmenu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectui-buildmenu/projectui-buildmenu/org/netbeans/modules/project/ui/buildmenu/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8UI\u30d3\u30eb\u30c9\u30fb\u30e1\u30cb\u30e5\u30fc
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/Bundle_ja.properties
index db93ddf..20bab15 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_CategoriesPanel=\u9078\u629e\u53ef\u80fd\u306a\u65b0\u898f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u30ab\u30c6\u30b4\u30ea\u4e00\u89a7
 ACSD_TemplatesPanel=\u9078\u629e\u53ef\u80fd\u306a\u65b0\u898f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30fb\u30bf\u30a4\u30d7\u306e\u4e00\u89a7
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle_ja.properties
index bed394d..8c56d96 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CloseAllProjectsAction=\u3059\u3079\u3066\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u9589\u3058\u308b
 CTL_CloseOtherProjectsAction=\u4ed6\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u9589\u3058\u308b(&L)
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/groups/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/groups/Bundle_ja.properties
index 0620077..e9f0670 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/groups/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/groups/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Group.close_handle=\u30b0\u30eb\u30fc\u30d7\u3092\u9589\u3058\u3066\u3044\u307e\u3059
 # {0} - group display name
 Group.open_handle=\u30b0\u30eb\u30fc\u30d7"{0}"\u3092\u958b\u3044\u3066\u3044\u307e\u3059
@@ -35,43 +52,6 @@
 ManageGroupsPanel.wrn_remove_all_groups_title=\u3059\u3079\u3066\u306e\u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664\u306e\u78ba\u8a8d
 ManageGroupsPanel.wrn_remove_selected_groups_msg=\u9078\u629e\u3057\u305f\u30b0\u30eb\u30fc\u30d7\u3092\u524a\u9664\u3057\u307e\u3059\u304b\u3002
 ManageGroupsPanel.wrn_remove_selected_groups_title=\u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664\u306e\u78ba\u8a8d
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2006, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 NewGroupPanel.adHocKindRadio.text=\u81ea\u7531\u306b\u30b0\u30eb\u30fc\u30d7\u5316(&F)
 NewGroupPanel.adHocKindLabel.text=\u5e0c\u671b\u3059\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u542b\u307e\u308c\u307e\u3059\u3002\u624b\u52d5\u307e\u305f\u306f\u81ea\u52d5\u3067\u66f4\u65b0\u3067\u304d\u307e\u3059\u3002
 NewGroupPanel.exists_warning=\u65e2\u5b58\u306e\u30b0\u30eb\u30fc\u30d7\u3068\u540c\u3058\u540d\u524d\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/problems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/problems/Bundle_ja.properties
index 4fd0e91..8762d5f 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/problems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/problems/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 
 
@@ -9,43 +26,6 @@
 LBL_BrokenLinksCustomizer_Close=\u9589\u3058\u308b
 LBL_BrokenLinksCustomizer_Problem_Was_Resolved=\u3053\u306e\u554f\u984c\u306f\u89e3\u6c7a\u3055\u308c\u307e\u3057\u305f
 LBL_BrokenLinksCustomizer_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u554f\u984c\u3092\u89e3\u6c7a - "{0}"\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 MSG_Broken_References_Label=<html><b>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u554f\u984c</b></html>
 MSG_Broken_References_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u958b\u304f
 MSG_BrokenReferencesAlertPanel_notAgain=\u4eca\u5f8c\u3053\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8868\u793a\u3057\u306a\u3044(&D)
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/quicksearch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/quicksearch/Bundle_ja.properties
index 3c697ce..d6267c0 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/quicksearch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/quicksearch/Bundle_ja.properties
@@ -1,41 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 QuickSearch/Projects=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/resources/ProjectTemplates_ja.html b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/resources/ProjectTemplates_ja.html
index 2637e89..ab62256d 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/resources/ProjectTemplates_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/resources/ProjectTemplates_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/resources/import_ja.html b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/resources/import_ja.html
index d8f5f38..eac5259 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/resources/import_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/resources/import_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/templatesFolder_ja.html b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/templatesFolder_ja.html
index d410aef..961b962 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/templatesFolder_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/templatesFolder_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_ja.properties
index bce68fc..985e170 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectui/projectui/org/netbeans/modules/project/ui/zip/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_ExportZIPAction=ZIP\u3078(&Z)...
 CTL_ImportZIPAction=ZIP\u304b\u3089(&Z)...
 # {0} - folder
@@ -17,43 +34,6 @@
 ERR_Unzip=\u89e3\u51cd\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
 # {0} - file
 ERR_zip_nonexistent={0}\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 ExportZIP.projectRadio.text=\u30eb\u30fc\u30c8\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8(&P):
 ExportZIP.otherRadio.text=\u305d\u306e\u4ed6\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea(&D):
 ExportZIP.otherButton.text=\u53c2\u7167(&B)...
diff --git a/netbeans-l10n-zip/src/ja/ide/projectuiapi-base/projectuiapi-base/org/netbeans/spi/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectuiapi-base/projectuiapi-base/org/netbeans/spi/project/ui/Bundle_ja.properties
index 31885cb..2ec091e 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectuiapi-base/projectuiapi-base/org/netbeans/spi/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectuiapi-base/projectuiapi-base/org/netbeans/spi/project/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d9\u30fc\u30b9\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8UI API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/projectuiapi/projectuiapi/org/netbeans/modules/project/uiapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectuiapi/projectuiapi/org/netbeans/modules/project/uiapi/Bundle_ja.properties
index 8eeaa49..61d448a 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectuiapi/projectuiapi/org/netbeans/modules/project/uiapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectuiapi/projectuiapi/org/netbeans/modules/project/uiapi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Customizer dialog
 LBL_Customizer_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/ide/projectuiapi/projectuiapi/org/netbeans/spi/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/projectuiapi/projectuiapi/org/netbeans/spi/project/ui/Bundle_ja.properties
index c5d3be3..f83ea88 100755
--- a/netbeans-l10n-zip/src/ja/ide/projectuiapi/projectuiapi/org/netbeans/spi/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/projectuiapi/projectuiapi/org/netbeans/spi/project/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8UI API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/properties-syntax/properties-syntax/org/netbeans/modules/properties/syntax/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/properties-syntax/properties-syntax/org/netbeans/modules/properties/syntax/Bundle_ja.properties
index 8ea7204..3cdfb08 100755
--- a/netbeans-l10n-zip/src/ja/ide/properties-syntax/properties-syntax/org/netbeans/modules/properties/syntax/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/properties-syntax/properties-syntax/org/netbeans/modules/properties/syntax/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest-syntax.mf
diff --git a/netbeans-l10n-zip/src/ja/ide/properties/properties/org/netbeans/modules/properties/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/properties/properties/org/netbeans/modules/properties/Bundle_ja.properties
index 91bf7e5..91e8282 100755
--- a/netbeans-l10n-zip/src/ja/ide/properties/properties/org/netbeans/modules/properties/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/properties/properties/org/netbeans/modules/properties/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9(&S)
 Loaders/text/x-properties/Factories/org-netbeans-modules-properties-PropertiesDataLoader.instance=\u30d7\u30ed\u30d1\u30c6\u30a3\u30fb\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/properties/properties/org/netbeans/modules/properties/TemplateHelp_ja.html b/netbeans-l10n-zip/src/ja/ide/properties/properties/org/netbeans/modules/properties/TemplateHelp_ja.html
index c6d62cc..3f18abd 100755
--- a/netbeans-l10n-zip/src/ja/ide/properties/properties/org/netbeans/modules/properties/TemplateHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/properties/properties/org/netbeans/modules/properties/TemplateHelp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/api/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/api/resources/Bundle_ja.properties
index 4b4d11b..4d5af81 100755
--- a/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/api/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/api/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/plugins/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/plugins/Bundle_ja.properties
index 5ef0676..0ce7435 100755
--- a/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/plugins/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/plugins/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_CopyFile=\u30d5\u30a1\u30a4\u30eb{0}\u3092\u30b3\u30d4\u30fc
 TXT_DeleteFile=\u30d5\u30a1\u30a4\u30eb{0}\u3092\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/spi/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/spi/impl/Bundle_ja.properties
index 6786bde..4c75be8 100755
--- a/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/spi/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/spi/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #*** Menu ***
 Menu/Refactoring=\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0(&A)
diff --git a/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/spi/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/spi/ui/Bundle_ja.properties
index 66d8dc9..8b704b9 100755
--- a/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/spi/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/refactoring-api/refactoring-api/org/netbeans/modules/refactoring/spi/ui/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_Scope=\u30b9\u30b3\u30fc\u30d7(&P):
 
diff --git a/netbeans-l10n-zip/src/ja/ide/schema2beans/schema2beans/org/netbeans/modules/schema2beans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/schema2beans/schema2beans/org/netbeans/modules/schema2beans/Bundle_ja.properties
index 09b5588..2b2c608 100755
--- a/netbeans-l10n-zip/src/ja/ide/schema2beans/schema2beans/org/netbeans/modules/schema2beans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/schema2beans/schema2beans/org/netbeans/modules/schema2beans/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # For manifest.mf at top level
 OpenIDE-Module-Name=Schema-to-Beans\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/schema2beans/schema2beans/org/netbeans/modules/schema2beansdev/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/schema2beans/schema2beans/org/netbeans/modules/schema2beansdev/Bundle_ja.properties
index d341102..2682322 100755
--- a/netbeans-l10n-zip/src/ja/ide/schema2beans/schema2beans/org/netbeans/modules/schema2beansdev/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/schema2beans/schema2beans/org/netbeans/modules/schema2beansdev/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # For manifest.mf at top level
 OpenIDE-Module-Name=schema2beans\u958b\u767a\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/selenium2-server/selenium2-server/org/netbeans/modules/selenium2/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/selenium2-server/selenium2-server/org/netbeans/modules/selenium2/server/Bundle_ja.properties
index ad62bd7..d968e1b 100755
--- a/netbeans-l10n-zip/src/ja/ide/selenium2-server/selenium2-server/org/netbeans/modules/selenium2/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/selenium2-server/selenium2-server/org/netbeans/modules/selenium2/server/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_CONFIGURE=Selenium\u30b5\u30fc\u30d0\u30fc\u306e\u69cb\u6210
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Selenium 2\u30b5\u30fc\u30d0\u30fc
 
 Selenium2_Server_Configure_Action_Name=\u69cb\u6210(&C)
diff --git a/netbeans-l10n-zip/src/ja/ide/selenium2/selenium2/org/netbeans/modules/selenium2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/selenium2/selenium2/org/netbeans/modules/selenium2/Bundle_ja.properties
index 5aa3403..c06ab56 100755
--- a/netbeans-l10n-zip/src/ja/ide/selenium2/selenium2/org/netbeans/modules/selenium2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/selenium2/selenium2/org/netbeans/modules/selenium2/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_RunSeleniumTestsAction=Selenium\u30c6\u30b9\u30c8\u306e\u5b9f\u884c
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Name=Selenium 2\u30b5\u30dd\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/ide/selenium2/selenium2/org/netbeans/modules/selenium2/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/selenium2/selenium2/org/netbeans/modules/selenium2/api/Bundle_ja.properties
index 632afbf..157720a 100755
--- a/netbeans-l10n-zip/src/ja/ide/selenium2/selenium2/org/netbeans/modules/selenium2/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/selenium2/selenium2/org/netbeans/modules/selenium2/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - template file
 MSG_template_not_found=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30fb\u30de\u30cd\u30fc\u30b8\u30e3\u3067Selenium 2.0\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/api/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/api/server/Bundle_ja.properties
index 12cb17e..7b7bfc7 100755
--- a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/api/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/api/server/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_ServerManager=\u30b5\u30fc\u30d0\u30fc
 TXT_CloudManager=\u30af\u30e9\u30a6\u30c9\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0
diff --git a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/resources/Bundle_ja.properties
index ae89f3a..864f452 100755
--- a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Name=\u5171\u901a\u30b5\u30fc\u30d0\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/manager/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/manager/Bundle_ja.properties
index ca8ce15..6f0f6fb 100755
--- a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/manager/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/manager/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Server_Registry_Node_Name=\u30b5\u30fc\u30d0\u30fc
 Server_Registry_Node_Short_Description=IDE\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u308b\u30b5\u30fc\u30d0\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/node/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/node/Bundle_ja.properties
index b1f6650..f6d64a0 100755
--- a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/node/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/node/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Server_Registry_Node_Name=\u30b5\u30fc\u30d0\u30fc
 Server_Registry_Node_Short_Description=IDE\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u308b\u30b5\u30fc\u30d0\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/wizard/Bundle_ja.properties
index 6e410bf..df8e704 100755
--- a/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/server/server/org/netbeans/modules/server/ui/wizard/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 LBL_ASIW_Title=\u30b5\u30fc\u30d0\u30fc\u30fb\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/ide/servletapi/servletapi/org/netbeans/modules/servletapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/servletapi/servletapi/org/netbeans/modules/servletapi/Bundle_ja.properties
index 02f61d4..2231cb4 100755
--- a/netbeans-l10n-zip/src/ja/ide/servletapi/servletapi/org/netbeans/modules/servletapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/servletapi/servletapi/org/netbeans/modules/servletapi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c82.2 API
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker-apimodule/spellchecker-apimodule/org/netbeans/modules/spellchecker/apimodule/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker-apimodule/spellchecker-apimodule/org/netbeans/modules/spellchecker/apimodule/Bundle_ja.properties
index cac4ef9..0869062 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker-apimodule/spellchecker-apimodule/org/netbeans/modules/spellchecker/apimodule/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker-apimodule/spellchecker-apimodule/org/netbeans/modules/spellchecker/apimodule/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Name=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30abAPI
 OpenIDE-Module-Short-Description=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u306eAPI
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker-bindings-htmlxml/spellchecker-bindings-htmlxml/org/netbeans/modules/spellchecker/bindings/htmlxml/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker-bindings-htmlxml/spellchecker-bindings-htmlxml/org/netbeans/modules/spellchecker/bindings/htmlxml/Bundle_ja.properties
index 79ef807..4d5ba6a 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker-bindings-htmlxml/spellchecker-bindings-htmlxml/org/netbeans/modules/spellchecker/bindings/htmlxml/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker-bindings-htmlxml/spellchecker-bindings-htmlxml/org/netbeans/modules/spellchecker/bindings/htmlxml/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Name=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30abHTML XML\u7d50\u5408
 OpenIDE-Module-Short-Description=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30abHTML XML\u7d50\u5408
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker-bindings-properties/spellchecker-bindings-properties/org/netbeans/modules/spellchecker/bindings/properties/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker-bindings-properties/spellchecker-bindings-properties/org/netbeans/modules/spellchecker/bindings/properties/Bundle_ja.properties
index a5fbd9c..ba935fe 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker-bindings-properties/spellchecker-bindings-properties/org/netbeans/modules/spellchecker/bindings/properties/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker-bindings-properties/spellchecker-bindings-properties/org/netbeans/modules/spellchecker/bindings/properties/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Name=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u7d50\u5408
 OpenIDE-Module-Short-Description=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u7d50\u5408
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker-dictionary_en/spellchecker-dictionary_en/org/netbeans/modules/spellchecker/dictionary_en/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker-dictionary_en/spellchecker-dictionary_en/org/netbeans/modules/spellchecker/dictionary_en/Bundle_ja.properties
index e87c8d4..4cce39d 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker-dictionary_en/spellchecker-dictionary_en/org/netbeans/modules/spellchecker/dictionary_en/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker-dictionary_en/spellchecker-dictionary_en/org/netbeans/modules/spellchecker/dictionary_en/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=\u30aa\u30f3\u30e9\u30a4\u30f3\u30fb\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u3067\u4f7f\u7528\u3059\u308bIspell\u306e(ver. 3.1.20)\u5358\u8a9e\u30ea\u30b9\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u82f1\u8a9e\u8f9e\u66f8
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker-kit/spellchecker-kit/org/netbeans/modules/spellchecker/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker-kit/spellchecker-kit/org/netbeans/modules/spellchecker/kit/Bundle_ja.properties
index c5f8a71..ee57e6a 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker-kit/spellchecker-kit/org/netbeans/modules/spellchecker/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker-kit/spellchecker-kit/org/netbeans/modules/spellchecker/kit/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Name=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/Bundle_ja.properties
index e942ea4..8853179 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 TP_MisspelledWord=\u30b9\u30da\u30eb\u30fb\u30df\u30b9\u306e\u5358\u8a9e
 ERR_MisspelledWord=\u30b9\u30da\u30eb\u30fb\u30df\u30b9\u306e\u5358\u8a9e
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/completion/Bundle_ja.properties
index 3bf0b73..169f415 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/completion/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 CTL_Add_to_projects=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8f9e\u66f8\u306b\u8ffd\u52a0\u3057\u307e\u3059\u3002
 CTL_Add_to_private=\u500b\u4eba\u306e\u8f9e\u66f8\u306b\u8ffd\u52a0\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/hints/Bundle_ja.properties
index 6f5636b..0863e55 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/hints/Bundle_ja.properties
@@ -1,45 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Copyright 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 2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 #{0}: the original word
 #{0}: the new (proposed) word
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/options/Bundle_ja.properties
index a0c2677..253a66b 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/options/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 TITLE_InstallDictionary=\u8f9e\u66f8\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
 MSG_DictionaryWasInstalled=\u8f9e\u66f8\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/resources/Bundle_ja.properties
index f8ae4d6..43aa769 100755
--- a/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/spellchecker/spellchecker/org/netbeans/modules/spellchecker/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Name=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u30fb\u30b3\u30a2
 OpenIDE-Module-Short-Description=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u30fb\u30b3\u30a2
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/Bundle_ja.properties
index 20f084c..13289ab 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/Bundle_ja.properties
@@ -1,45 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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
-# NotiMSG_RenameFailedce 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.
-
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Subversion_DisplayName = Subversion
 CTL_Subversion_MainMenu = Subversion(&S)
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/client/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/client/Bundle_ja.properties
index 72adee7..84605f6 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/client/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/client/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Action_Cancel=\u53d6\u6d88
 CTL_WC18SwitchToCmd=OK(&O)
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/client/cli/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/client/cli/Bundle_ja.properties
index 6e6f18b..aab36f1 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/client/cli/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/client/cli/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_Error.diffSummaryWithCLI=\u30b3\u30de\u30f3\u30c9\u884c\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u4f7f\u7528\u3057\u305f\u30ea\u30d3\u30b8\u30e7\u30f3\u30fb\u30c4\u30ea\u30fc\u9593\u306e\u5dee\u5206\u306e\u53d6\u5f97\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\nSVNKit\u307e\u305f\u306fJavaHL\u306b\u5207\u308a\u66ff\u3048\u3066\u304f\u3060\u3055\u3044\u3002
 MSG_Error.diffSummaryWithCLI.CLIforced=\u30b3\u30de\u30f3\u30c9\u884c\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u4f7f\u7528\u3057\u305f\u30ea\u30d3\u30b8\u30e7\u30f3\u30fb\u30c4\u30ea\u30fc\u9593\u306e\u5dee\u5206\u306e\u53d6\u5f97\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 MSG_Error.reintegrateBranchWithCLI=\u30b3\u30de\u30f3\u30c9\u884c\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u4f7f\u7528\u3057\u305f\u5206\u5c90\u306e\u518d\u7d71\u5408\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\nSVNKit\u307e\u305f\u306fJavaHL\u306b\u5207\u308a\u66ff\u3048\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/config/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/config/Bundle_ja.properties
index 7956fb3..0976335 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/config/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/config/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ## ProxySelector.java
 BK2000=\u4f7f\u7528\u3055\u308c\u305fNetBeans HTTP\u30d7\u30ed\u30ad\u30b7
 BK2002=\u691c\u51fa\u3055\u308c\u305f\u76f4\u63a5\u63a5\u7d9a
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/notifications/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/notifications/Bundle_ja.properties
index b1bf1fe..a154681 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/notifications/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/notifications/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_NotificationBubble_Description=\u6b21\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f:<br>{0}<a href="{1}">\u30ea\u30d3\u30b8\u30e7\u30f3\u306e\u8a73\u7d30\u3092\u8868\u793a</a><br><a href="{2}">\u30ea\u30e2\u30fc\u30c8\u3067\u306e\u5909\u66f4\u306e\u5dee\u5206</a><br>
 MSG_NotificationBubble_DeleteDescription=\u6b21\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f:<br>{0}<a href="{1}">\u30ea\u30e2\u30fc\u30c8\u3067\u306e\u5909\u66f4\u306e\u5dee\u5206</a><br>
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/options/Bundle_ja.properties
index 6f4136a..9d9ce0c 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/options/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AnnotationColorsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
 CTL_OptionsPanel.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/resources/Bundle_ja.properties
index e834658..0ec86ef 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## manifest mf
 OpenIDE-Module-Name=Subversion
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/actions/Bundle_ja.properties
index b5d3cb6..1c9fe99 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_SVNCommands_Label=Subversion
 
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/blame/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/blame/Bundle_ja.properties
index da6b4e5..df9464d 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/blame/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/blame/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AnnotationSubstitute = \u8a08\u7b97\u4e2d...
 CTL_AnnotationFailed = \u4f7f\u7528\u4e0d\u53ef
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/browser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/browser/Bundle_ja.properties
index 3725618..b1fdb93 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/browser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/browser/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_BrowserAction=\u53c2\u7167
 
 LBL_RepositoryBrowser=\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30d5\u30a9\u30eb\u30c0\u3092\u53c2\u7167:
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/checkout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/checkout/Bundle_ja.properties
index ecf063b..ede6260 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/checkout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/checkout/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CheckoutAction_Name=\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8(&K)...
 
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/commit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/commit/Bundle_ja.properties
index bfd6655..6ae0211 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/commit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/commit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Commit=\u30b3\u30df\u30c3\u30c8(&M)...
 CTL_MenuItem_Commit_Context=\u30b3\u30df\u30c3\u30c8(&M)...
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/copy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/copy/Bundle_ja.properties
index 361195d..b1124f3 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/copy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/copy/Bundle_ja.properties
@@ -1,46 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_Merge_ReintegrateBranch=\u6a5f\u80fd\u30d6\u30e9\u30f3\u30c1\u306e\u518d\u7d71\u5408
 CTL_Merge_ReintegrateBranchDesc=\u307e\u3060\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306b\u306a\u3044\u6a5f\u80fd\u5206\u5c90\u306e\u3059\u3079\u3066\u306e\u5909\u66f4\u3092\u30de\u30fc\u30b8\u3057\u307e\u3059\u3002
-# 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.
 CTL_Title = \u30b3\u30d4\u30fc/\u5207\u66ff\u3048/\u30de\u30fc\u30b8
 ## CreateCopyAction.java
 CTL_MenuItem_Copy = \u30b3\u30d4\u30fc\u5148(&C)...
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/diff/Bundle_ja.properties
index 2ad94dc..4598116 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/diff/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## DiffAction.java
 CTL_MenuItem_Diff = \u5dee\u5206(&D)
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/export/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/export/Bundle_ja.properties
index dee7668..f937bdc 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/export/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/export/Bundle_ja.properties
@@ -1,45 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#~
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ExportDialog_Title=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
 CTL_MenuItem_Export=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8(&E)...
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/history/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/history/Bundle_ja.properties
index 019629e..e217ead 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/history/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/history/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Action.ViewCurrent.name=\u73fe\u5728\u306e\u8868\u793a
 CTL_MenuItem_SearchHistory = \u5c65\u6b74\u3092\u691c\u7d22(&H)...
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/ignore/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/ignore/Bundle_ja.properties
index 0e9cde9..a623437 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/ignore/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/ignore/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_Ignore = \u7121\u8996(&I)
 CTL_MenuItem_Ignore_Context = \u7121\u8996(&I)
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/lock/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/lock/Bundle_ja.properties
index cac00bc..298d0a8 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/lock/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/lock/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Lock
 CTL_Lock_Title = \u30ed\u30c3\u30af(&L)
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/menu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/menu/Bundle_ja.properties
index 5e6084d..6bd15df 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/menu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/menu/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_MenuItem_CopyMenu=\u30b3\u30d4\u30fc(&C)
 CTL_MenuItem_CopyMenu.popup=\u30b3\u30d4\u30fc
 CTL_MenuItem_DiffMenu=\u5dee\u5206(&D)
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/project/Bundle_ja.properties
index 0db0a4d..091bb2e 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #CheckinAction.java
 CTL_PopupMenuItem_Import=Subversion\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30a4\u30f3\u30dd\u30fc\u30c8(&S)...
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/properties/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/properties/Bundle_ja.properties
index b408b1d..65924ac 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/properties/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/properties/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_MenuItem_VersioningInfoAction=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u60c5\u5831(&G)
 CTL_PropertiesAction=\u30d7\u30ed\u30d1\u30c6\u30a3(&O)
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/relocate/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/relocate/Bundle_ja.properties
index 17c99b3..6c72241 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/relocate/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/relocate/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Relocate_Dialog_Title = \u518d\u914d\u7f6e
 CTL_Relocate_Title=\u518d\u914d\u7f6e(&R)...
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/repository/Bundle_ja.properties
index 89b30b6..6a13dcd 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/repository/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## RepositoryPanel.java
 BK0001=Subversion\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5834\u6240\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044:
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/search/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/search/Bundle_ja.properties
index 72bcb7c..3e11cd4 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/search/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/search/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # {0} - resource URL
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/shelve/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/shelve/Bundle_ja.properties
index d27396d..dbc28a6 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/shelve/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/shelve/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ShelveChanges_Title = \u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6(&S)...
 CTL_ShelveChanges_Title_Context = \u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6(&S)...
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/status/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/status/Bundle_ja.properties
index c5421fa..3e445b9 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/status/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/status/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Versioning_TopComponent_Title = Subversion
 CTL_Versioning_TopComponent_MultiTitle = Subversion - {0} ({1})
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/update/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/update/Bundle_ja.properties
index 32a38a8..8bc1a42 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/update/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/update/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## UpdateAction.java
 CTL_MenuItem_Update = HEAD\u306b\u66f4\u65b0(&U)
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wcadmin/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wcadmin/Bundle_ja.properties
index 95945df..4d389d6 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wcadmin/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wcadmin/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Cleanup_Title=\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7(&C)
 CTL_Cleanup_Title_Context=\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7(&C)
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/Bundle_ja.properties
index 3a9ffc1..9f0370b 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CheckoutAction=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/checkoutstep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/checkoutstep/Bundle_ja.properties
index 3c87eab..18e0b35 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/checkoutstep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/checkoutstep/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ## WorkdirStep.java
 BK2024=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b\u30d5\u30a9\u30eb\u30c0
 
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle_ja.properties
index b51529a..5c07deb 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/importstep/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ## ImportStep.java
 BK2014=\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30d5\u30a9\u30eb\u30c0\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
 
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/repositorystep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/repositorystep/Bundle_ja.properties
index d00d9f2..0adea91 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/repositorystep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/repositorystep/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ## RepositoryStep.java
 BK2018=Subversion\u30ea\u30dd\u30b8\u30c8\u30ea
 BK2019=\u30c6\u30b9\u30c8\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30d7\u30ed\u30ad\u30b7\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/urlpatternstep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/urlpatternstep/Bundle_ja.properties
index d5b6641..bab13a6 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/urlpatternstep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/ui/wizards/urlpatternstep/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_Name=\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30d5\u30a9\u30eb\u30c0
 
 CTL_URLPattern_RepositoryHint=\u30d5\u30a9\u30eb\u30c0(\u5206\u5c90/\u30bf\u30b0)\u304a\u3088\u3073\u30d5\u30a9\u30eb\u30c0\u540d\u306e\u8a73\u7d30\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/util/Bundle_ja.properties
index f643f03..7fc1861 100755
--- a/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/subversion/subversion/org/netbeans/modules/subversion/util/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 MSG_too_old_WC=\u4f5c\u696d\u4e2d\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3\u3067\u4f5c\u6210\u3055\u308c\u305f\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\nSVN\u30af\u30e9\u30a4\u30a2\u30f3\u30c81.5.0\u4ee5\u964d\u3092\u4f7f\u7528\u3057\u3066\u3001\u30d5\u30a1\u30a4\u30eb\u3092\u3082\u3046\u4e00\u5ea6\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/Bundle_ja.properties
index 5ee5e8d..22c2789 100755
--- a/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/Bundle_ja.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u691c\u67fbUI API
 
 GENERIC_EMPTY_TEXTFIELD_ERROR={0}\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/builtin/stringvalidation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/builtin/stringvalidation/Bundle_ja.properties
index 058080b..4a7571e 100755
--- a/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/builtin/stringvalidation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/builtin/stringvalidation/Bundle_ja.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ERR_TEXTFIELD_EMPTY={0}\u306e\u8a2d\u5b9a\u304c\u5fc5\u8981\u3067\u3059
 ERR_JAVA_IDENTIFIER={0}\u306f\u6b63\u3057\u3044Java\u5909\u6570/\u30af\u30e9\u30b9\u540d\u3067\u306f\u3042\u308a\u307e\u305b\u3093
 ERR_INVALID_FILE_NAME={0} ''{1}''\u306b\u4e0d\u6b63\u306a\u30d5\u30a1\u30a4\u30eb\u540d\u6587\u5b57\u304c\u542b\u307e\u308c\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/ui/swing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/ui/swing/Bundle_ja.properties
index 796f35c..57204b8 100755
--- a/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/ui/swing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/swing-validation/ext/ValidationAPI/org/netbeans/validation/api/ui/swing/Bundle_ja.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 WARNING_LABEL=\u8b66\u544a\u30e9\u30d9\u30eb
 OK=OK
 Cancel=\u53d6\u6d88
diff --git a/netbeans-l10n-zip/src/ja/ide/swing-validation/swing-validation/org/netbeans/api/validation/adapters/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/swing-validation/swing-validation/org/netbeans/api/validation/adapters/Bundle_ja.properties
index cab3378..ff100f1 100755
--- a/netbeans-l10n-zip/src/ja/ide/swing-validation/swing-validation/org/netbeans/api/validation/adapters/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/swing-validation/swing-validation/org/netbeans/api/validation/adapters/Bundle_ja.properties
@@ -1,43 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 BTN_CLOSE=\u9589\u3058\u308b
 
diff --git a/netbeans-l10n-zip/src/ja/ide/swing-validation/swing-validation/org/netbeans/modules/swing/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/swing-validation/swing-validation/org/netbeans/modules/swing/validation/Bundle_ja.properties
index a1981eb..5257786 100755
--- a/netbeans-l10n-zip/src/ja/ide/swing-validation/swing-validation/org/netbeans/modules/swing/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/swing-validation/swing-validation/org/netbeans/modules/swing/validation/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Swing
 OpenIDE-Module-Long-Description=Swing\u306e\u5358\u7d14\u306a\u691c\u67fbAPI\u306e\u30e9\u30c3\u30d1\u30fc\u3067\u3059\u3002\u3053\u306eAPI\u306f\u3001Swing\u306e\u30e6\u30fc\u30b6\u30fc\u30fb\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u306b\u691c\u67fb\u30b3\u30fc\u30c9\u3092\u7c21\u5358\u306b\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306e\u5358\u7d14\u306a\u30e9\u30a4\u30d6\u30e9\u30ea\u3067\u3059\u3002
 OpenIDE-Module-Name=Swing\u306e\u7c21\u5358\u306a\u691c\u67fbAPI
diff --git a/netbeans-l10n-zip/src/ja/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/Bundle_ja.properties
index 5e9dc41..e24af21 100755
--- a/netbeans-l10n-zip/src/ja/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30c1\u30e5\u30fc\u30b6\u30fb\u30d1\u30cd\u30eb
 OpenIDE-Module-Short-Description=\u3055\u307e\u3056\u307e\u306aWeb\u30d9\u30fc\u30b9\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u7528\u306e\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30c1\u30e5\u30fc\u30b6\u30fb\u30a6\u30a3\u30b6\u30fc\u30c9\u30fb\u30d1\u30cd\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/api/Bundle_ja.properties
index 641c6be..1734f57 100755
--- a/netbeans-l10n-zip/src/ja/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/target-iterator/target-iterator/org/netbeans/modules/target/iterator/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_invalid_filename=\u30d5\u30a1\u30a4\u30eb\u540d\u304c\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 MSG_invalid_foldername=\u30d5\u30a9\u30eb\u30c0\u540d\u304c\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/tasklist-kit/tasklist-kit/org/netbeans/modules/tasklist/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/tasklist-kit/tasklist-kit/org/netbeans/modules/tasklist/kit/Bundle_ja.properties
index 82bc64d..a247329 100755
--- a/netbeans-l10n-zip/src/ja/ide/tasklist-kit/tasklist-kit/org/netbeans/modules/tasklist/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/tasklist-kit/tasklist-kit/org/netbeans/modules/tasklist/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Name=\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8
 OpenIDE-Module-Long-Description=\u300cTODO\u300d\u3001\u300cXXX\u300d\u3001\u300cPENDING\u300d\u3001Java\u30b3\u30f3\u30d1\u30a4\u30eb\u30fb\u30a8\u30e9\u30fc\u3092\u542b\u3080\u884c\u306a\u3069\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u3067\u51e6\u7406\u5bfe\u8c61\u306e\u5834\u6240\u3092\u30ea\u30b9\u30c8\n\u3057\u305f\u3001\u300c\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\u30ea\u30b9\u30c8\u5185\u306e\u30a8\u30f3\u30c8\u30ea\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u3001\u30b3\u30fc\u30c9\u5185\u306e\u95a2\u9023\u3059\u308b\u5834\u6240\u3078\u79fb\u52d5\n\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/tasklist-projectint/tasklist-projectint/org/netbeans/modules/tasklist/projectint/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/tasklist-projectint/tasklist-projectint/org/netbeans/modules/tasklist/projectint/Bundle_ja.properties
index d925f1c..0d7aec6 100755
--- a/netbeans-l10n-zip/src/ja/ide/tasklist-projectint/tasklist-projectint/org/netbeans/modules/tasklist/projectint/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/tasklist-projectint/tasklist-projectint/org/netbeans/modules/tasklist/projectint/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8
 OpenIDE-Module-Long-Description=\u300c\u30a2\u30af\u30b7\u30e7\u30f3\u9805\u76ee\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u6709\u52b9\u306b\u3057\u3066\u3001\u9078\u629e\u3057\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u307e\u305f\u306f\u958b\u304b\u308c\u3066\u3044\u308b\u3059\u3079\u3066\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u9805\u76ee\u3092\u30b9\u30ad\u30e3\u30f3\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30bf\u30b9\u30af\u30fb\u30ea\u30b9\u30c8 - \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u7d71\u5408
diff --git a/netbeans-l10n-zip/src/ja/ide/tasklist-todo/tasklist-todo/org/netbeans/modules/tasklist/todo/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/tasklist-todo/tasklist-todo/org/netbeans/modules/tasklist/todo/Bundle_ja.properties
index 9d5afee..59f67a1 100755
--- a/netbeans-l10n-zip/src/ja/ide/tasklist-todo/tasklist-todo/org/netbeans/modules/tasklist/todo/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/tasklist-todo/tasklist-todo/org/netbeans/modules/tasklist/todo/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30bf\u30b9\u30af
 OpenIDE-Module-Long-Description=\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u30fb\u30b3\u30e1\u30f3\u30c8\u5185\u306eToDo\u9805\u76ee\u3092\u30b9\u30ad\u30e3\u30f3\u3057\u3001\u5404\u9805\u76ee\u306f\u300c\u30a2\u30af\u30b7\u30e7\u30f3\u9805\u76ee\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u8868\u793a\u3055\u308c\u307e\u3059
 OpenIDE-Module-Name=ToDo\u30bf\u30b9\u30af\u30fb\u30b9\u30ad\u30e3\u30ca
diff --git a/netbeans-l10n-zip/src/ja/ide/tasklist-todo/tasklist-todo/org/netbeans/modules/tasklist/todo/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/tasklist-todo/tasklist-todo/org/netbeans/modules/tasklist/todo/settings/Bundle_ja.properties
index 53a0c18..1eaf227 100755
--- a/netbeans-l10n-zip/src/ja/ide/tasklist-todo/tasklist-todo/org/netbeans/modules/tasklist/todo/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/tasklist-todo/tasklist-todo/org/netbeans/modules/tasklist/todo/settings/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ToDoCustomizer.checkScanCommentsOnly.text=\u30b3\u30e1\u30f3\u30c8\u304b\u3089\u306eToDo\u306e\u307f\u3092\u8868\u793a(&S)
 
 ToDoCustomizer.TableHeader=ToDo\u30d1\u30bf\u30fc\u30f3(&P)
diff --git a/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/filter/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/filter/Bundle_ja.properties
index 08ef304..92f96cb 100755
--- a/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/filter/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/filter/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # A11y for the "filter"-dialog
diff --git a/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/impl/Bundle_ja.properties
index 48b797a..d78b309 100755
--- a/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/impl/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_CurrentEditorScope=\u73fe\u5728\u306e\u30d5\u30a1\u30a4\u30eb
 HINT_CurrentEditorScope=\u73fe\u5728\u7de8\u96c6\u4e2d\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u9805\u76ee\u306e\u307f\u8868\u793a
 LBL_ShowSource=\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/Bundle_ja.properties
index 059b32a..1166976 100755
--- a/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_TaskListAction=\u30a2\u30af\u30b7\u30e7\u30f3\u9805\u76ee(&M)
 CTL_TaskListTopComponent=\u30a2\u30af\u30b7\u30e7\u30f3\u9805\u76ee
 HINT_TaskListTopComponent=\u3053\u308c\u306f\u300c\u30a2\u30af\u30b7\u30e7\u30f3\u9805\u76ee\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/resources/Bundle_ja.properties
index 86d51e5..8f83c0a 100755
--- a/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/tasklist-ui/tasklist-ui/org/netbeans/modules/tasklist/ui/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_error_group=\u30a8\u30e9\u30fc
 HINT_error_group=\u30a8\u30e9\u30fc\u304a\u3088\u3073\u91cd\u8981\u306a\u554f\u984c
 
diff --git a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/bugtracking/commons/Bundle2_ja.properties b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/bugtracking/commons/Bundle2_ja.properties
index 820f0af..26ade28 100755
--- a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/bugtracking/commons/Bundle2_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/bugtracking/commons/Bundle2_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SectionPanel.title=\u30bf\u30a4\u30c8\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/bugtracking/commons/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/bugtracking/commons/Bundle_ja.properties
index a14a328..ea73bae 100755
--- a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/bugtracking/commons/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/bugtracking/commons/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - stands for an issue tracking plugins name available for download - e.g. Bugzilla of JIRA
 CTL_AutoupdateTitle={0}\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u65b0\u3057\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u304c\u3042\u308a\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/Bundle_ja.properties
index 294c132..13b9764 100755
--- a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Name=\u30c1\u30fc\u30e0Commons
 OpenIDE-Module-Short-Description=\u30c1\u30fc\u30e0\u30fb\u30b5\u30fc\u30d0\u30fc\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u3068\u554f\u984c\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u306b\u4f7f\u7528\u3055\u308c\u308bCommons\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/resources/Bundle_ja.properties
index 13b5d3c..eadeccc 100755
--- a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OptionsCategory_Keywords_Team=\u30c1\u30fc\u30e0\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3
 OptionsCategory_Name_Team=\u30c1\u30fc\u30e0
 
diff --git a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/treelist/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/treelist/Bundle_ja.properties
index cb6e10d..2bd89d2 100755
--- a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/treelist/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/commons/treelist/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_LoadingInProgress=\u30ed\u30fc\u30c9\u4e2d...
 LBL_NotResponding=\u5fdc\u7b54\u304c\u3042\u308a\u307e\u305b\u3093
 LBL_Retry=\u518d\u8a66\u884c
diff --git a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/spi/Bundle_ja.properties
index e9f6420..bff1023 100755
--- a/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/team-commons/team-commons/org/netbeans/modules/team/spi/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_All=\u3059\u3079\u3066\u306e\u30bf\u30b9\u30af
 LBL_Mine=\u81ea\u5206\u306b\u5272\u5f53\u3066\u6e08
diff --git a/netbeans-l10n-zip/src/ja/ide/team-ide/team-ide/org/netbeans/modules/team/ide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/team-ide/team-ide/org/netbeans/modules/team/ide/Bundle_ja.properties
index b0bbcb7..3933eea 100755
--- a/netbeans-l10n-zip/src/ja/ide/team-ide/team-ide/org/netbeans/modules/team/ide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/team-ide/team-ide/org/netbeans/modules/team/ide/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ChooseDate=\u65e5\u4ed8\u306e\u9078\u629e
 LBL_Error=\u30a8\u30e9\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/iocontainer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/iocontainer/Bundle_ja.properties
index 287a402..141d6cd 100755
--- a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/iocontainer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/iocontainer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CloseWindow=\u30bf\u30d6\u3092\u9589\u3058\u308b
 LBL_CloseAll=\u3059\u3079\u3066\u306e\u30bf\u30d6\u3092\u9589\u3058\u308b
diff --git a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/ioprovider/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/ioprovider/Bundle_ja.properties
index d8a9af8..41afcca 100755
--- a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/ioprovider/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/ioprovider/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_Clear=\u30af\u30ea\u30a2
 CTL_Close=\u9589\u3058\u308b
 CTL_Copy=\u30b3\u30d4\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/Bundle_ja.properties
index 56e3e02..1fb009a 100755
--- a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 FontChooser.defaultFont.label=\u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30d5\u30a9\u30f3\u30c8
 FontChooser.title=\u30d5\u30a9\u30f3\u30c8\u30fb\u30c1\u30e5\u30fc\u30b6
 MSG_Hello=Hello from Term
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=NetBeans\u5185\u306e\u30bf\u30fc\u30df\u30ca\u30eb\n<br>\nNetBeans\u5185\u3067\u30b7\u30a7\u30eb\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53d6\u5f97\u3059\u308b\u306b\u306f\u3001\u300c\u5b9f\u884c\u300d>\u300c\u30b7\u30a7\u30eb\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u300d\u3092\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n<br>\nNetBeans\u5185\u3067\u4efb\u610f\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f\u3001\u300c\u5b9f\u884c\u300d>\u300c\u30b3\u30de\u30f3\u30c9\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u300d\u3092\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n<br>\n\u300c\u30a6\u30a3\u30f3\u30c9\u30a6\u300d>\u300c\u51fa\u529b\u300d>\u300c\u30bf\u30fc\u30df\u30ca\u30eb\u300d\u306b\u3088\u3063\u3066\u3001\u9589\u3058\u3089\u308c\u305f\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u3075\u305f\u305f\u3073\u958b\u304b\u308c\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30bf\u30fc\u30df\u30ca\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/actions/Bundle_ja.properties
index 5f5e78e..45d5d4e 100755
--- a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Clear=\u30af\u30ea\u30a2
 CTL_Close=\u9589\u3058\u308b
diff --git a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/resources/Bundle_ja.properties
index d33d267..5a38e70 100755
--- a/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/terminal-nb/terminal-nb/org/netbeans/modules/terminal/nb/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30bf\u30fc\u30df\u30ca\u30eb\u306e\u5b9f\u88c5
 
diff --git a/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/Bundle_ja.properties
index a66d36c..1317c46 100755
--- a/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=NetBeans\u5185\u306e\u30bf\u30fc\u30df\u30ca\u30eb\n<br>\nNetBeans\u5185\u3067\u30b7\u30a7\u30eb\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53d6\u5f97\u3059\u308b\u306b\u306f\u3001\u300c\u5b9f\u884c\u300d>\u300c\u30b7\u30a7\u30eb\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u300d\u3092\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n<br>\nNetBeans\u5185\u3067\u4efb\u610f\u306e\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f\u3001\u300c\u5b9f\u884c\u300d>\u300c\u30b3\u30de\u30f3\u30c9\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u300d\u3092\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n<br>\n\u300c\u30a6\u30a3\u30f3\u30c9\u30a6\u300d>\u300c\u51fa\u529b\u300d>\u300c\u30bf\u30fc\u30df\u30ca\u30eb\u300d\u306b\u3088\u3063\u3066\u3001\u9589\u3058\u3089\u308c\u305f\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u304c\u3075\u305f\u305f\u3073\u958b\u304b\u308c\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30bf\u30fc\u30df\u30ca\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/actions/Bundle_ja.properties
index 1d59d95..7bbb27b 100755
--- a/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Clear=\u30af\u30ea\u30a2
 CTL_Close=\u9589\u3058\u308b
diff --git a/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/iocontainer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/iocontainer/Bundle_ja.properties
index 287a402..141d6cd 100755
--- a/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/iocontainer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/iocontainer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CloseWindow=\u30bf\u30d6\u3092\u9589\u3058\u308b
 LBL_CloseAll=\u3059\u3079\u3066\u306e\u30bf\u30d6\u3092\u9589\u3058\u308b
diff --git a/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/ioprovider/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/ioprovider/Bundle_ja.properties
index 2219836..23c24e0 100755
--- a/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/ioprovider/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/terminal/terminal/org/netbeans/modules/terminal/ioprovider/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_Clear=\u30af\u30ea\u30a2
 CTL_Close=\u9589\u3058\u308b
 CTL_Copy=\u30b3\u30d4\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/usersguide/usersguide/org/netbeans/modules/usersguide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/usersguide/usersguide/org/netbeans/modules/usersguide/Bundle_ja.properties
index bd68e4b..ae45396 100755
--- a/netbeans-l10n-zip/src/ja/ide/usersguide/usersguide/org/netbeans/modules/usersguide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/usersguide/usersguide/org/netbeans/modules/usersguide/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Menu/Help/org-netbeans-modules-usersguide-master.xml=\u30d8\u30eb\u30d7\u306e\u76ee\u6b21(&C)
 
diff --git a/netbeans-l10n-zip/src/ja/ide/utilities-project/utilities-project/org/netbeans/modules/search/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/utilities-project/utilities-project/org/netbeans/modules/search/project/Bundle_ja.properties
index b63891e..6260af7 100755
--- a/netbeans-l10n-zip/src/ja/ide/utilities-project/utilities-project/org/netbeans/modules/search/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/utilities-project/utilities-project/org/netbeans/modules/search/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2004-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest.mf
diff --git a/netbeans-l10n-zip/src/ja/ide/utilities-project/utilities-project/org/netbeans/modules/utilities/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/utilities-project/utilities-project/org/netbeans/modules/utilities/project/Bundle_ja.properties
index aec6728..1e744b9 100755
--- a/netbeans-l10n-zip/src/ja/ide/utilities-project/utilities-project/org/netbeans/modules/utilities/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/utilities-project/utilities-project/org/netbeans/modules/utilities/project/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_CopyPath=\u30d5\u30a1\u30a4\u30eb\u30fb\u30d1\u30b9\u306e\u30b3\u30d4\u30fc
 CTL_CopyPaths=\u30d5\u30a1\u30a4\u30eb\u30fb\u30d1\u30b9\u306e\u30b3\u30d4\u30fc
 # {0} - number of copied paths
diff --git a/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/openfile/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/openfile/Bundle_ja.properties
index e87db42..4e9d5a0 100755
--- a/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/openfile/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/openfile/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 EXC_MissingArgOpen=--open\u306b\u5f15\u6570\u304c\u8db3\u308a\u307e\u305b\u3093
 MSG_OpenOptionDescription=\u6307\u5b9a\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb(\u304a\u305d\u3089\u304f\u3001\u6307\u5b9a\u3055\u308c\u305f\u5834\u6240\u306b\u3042\u308b)\u3092\u958b\u304d\u307e\u3059\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u6e21\u3059\u3053\u3068\u3082\u3067\u304d\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/pdf/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/pdf/Bundle_ja.properties
index 6b5245e..1bc785c 100755
--- a/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/pdf/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/pdf/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # PDFDataLoader
 LBL_loaderName=PDF\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/url/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/url/Bundle_ja.properties
index 43ea344..b8a5490 100755
--- a/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/url/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/url/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 PROP_URLLoader_Name=URL\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/utilities/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/utilities/Bundle_ja.properties
index 6b8a572..c10d89e 100755
--- a/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/utilities/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/utilities/utilities/org/netbeans/modules/utilities/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest.mf
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-core/versioning-core/org/netbeans/modules/versioning/core/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-core/versioning-core/org/netbeans/modules/versioning/core/Bundle_ja.properties
index 6bda2a5..ce06876 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-core/versioning-core/org/netbeans/modules/versioning/core/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-core/versioning-core/org/netbeans/modules/versioning/core/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_OtherVCS.menu=\u305d\u306e\u4ed6\u306eVCS (&V)
 LBL_PopupMenu_Initializing=\u521d\u671f\u5316\u3057\u3066\u3044\u307e\u3059...
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-indexingbridge/versioning-indexingbridge/org/netbeans/modules/versioning/indexingbridge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-indexingbridge/versioning-indexingbridge/org/netbeans/modules/versioning/indexingbridge/Bundle_ja.properties
index 60c6673..dd18a73 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-indexingbridge/versioning-indexingbridge/org/netbeans/modules/versioning/indexingbridge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-indexingbridge/versioning-indexingbridge/org/netbeans/modules/versioning/indexingbridge/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u306e\u7d22\u5f15\u30d6\u30ea\u30c3\u30b8
 
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-masterfs/versioning-masterfs/org/netbeans/modules/versioning/masterfs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-masterfs/versioning-masterfs/org/netbeans/modules/versioning/masterfs/Bundle_ja.properties
index e3a1a19..16ce70a 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-masterfs/versioning-masterfs/org/netbeans/modules/versioning/masterfs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-masterfs/versioning-masterfs/org/netbeans/modules/versioning/masterfs/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Name=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406/\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0\u30fb\u30d6\u30ea\u30c3\u30b8
 OpenIDE-Module-Short-Description=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406API\u3092\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0\u3068\u63a5\u7d9a
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-system-cvss-installer/versioning-system-cvss-installer/org/netbeans/modules/versioning/system/cvss/installer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-system-cvss-installer/versioning-system-cvss-installer/org/netbeans/modules/versioning/system/cvss/installer/Bundle_ja.properties
index 4f93a03..5e4589f 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-system-cvss-installer/versioning-system-cvss-installer/org/netbeans/modules/versioning/system/cvss/installer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-system-cvss-installer/versioning-system-cvss-installer/org/netbeans/modules/versioning/system/cvss/installer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
 OpenIDE-Module-Name=CVS\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/Bundle_ja.properties
index 93501b9..89f0898 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406UI
 OpenIDE-Module-Display-Category=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/diff/Bundle_ja.properties
index 9668286..8176eaf 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/diff/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_DiffPane_Original = \u5143
 LBL_DiffPane_WorkingCopy = \u4f5c\u696d\u30b3\u30d4\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/history/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/history/Bundle_ja.properties
index 29877a7..7bb29e3 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/history/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/history/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_LocalHistory_Column_Label=\u30e1\u30c3\u30bb\u30fc\u30b8
 LBL_LocalHistory_Column_Label_Desc=\u5909\u66f4\u3092\u8aac\u660e\u3059\u308b\u30e1\u30c3\u30bb\u30fc\u30b8\u307e\u305f\u306f\u30e9\u30d9\u30eb
 LBL_LocalHistory_Column_Version=\u30ea\u30d3\u30b8\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/options/Bundle_ja.properties
index 94c8325..0386289 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AdvancedOption_DisplayName=\u4e00\u822c
 AdvancedOption_Tooltip=\u4e00\u822c\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30aa\u30d7\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/resources/Bundle_ja.properties
index df14b11..0b4fa06 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-ui/versioning-ui/org/netbeans/modules/versioning/ui/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## svn-layer.xml
 Actions/History=\u5c65\u6b74
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/annotate/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/annotate/Bundle_ja.properties
index 265d54f..bf465e7 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/annotate/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/annotate/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AnnotationSubstitute = <\u8a08\u7b97\u4e2d...>
 CTL_StatusBar_WaitFetchAnnotation = <\u8a08\u7b97\u4e2d...> 
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/diff/Bundle_ja.properties
index 4538c87..9c16384 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/diff/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - file name
 MSG_SavingFile={0}\u3092\u4fdd\u5b58\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/history/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/history/Bundle_ja.properties
index aab0851..62120e2 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/history/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/history/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSN_SummaryView_List = \u898b\u3064\u304b\u3063\u305f\u30b3\u30df\u30c3\u30c8\u306e\u4e00\u89a7
 ACSD_SummaryView_List = \u898b\u3064\u304b\u3063\u305f\u30b3\u30df\u30c3\u30c8\u3092\u30d5\u30a1\u30a4\u30eb\u540d\u3068\u30ea\u30d3\u30b8\u30e7\u30f3\u756a\u53f7\u3067\u30bd\u30fc\u30c8\u3057\u305f\u30d5\u30e9\u30c3\u30c8\u306a\u30ea\u30b9\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/Bundle_ja.properties
index 3d6a379..fd6676b 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - invalid character
 ShelveChangesPanel.lblError.invalidCharacters=\u30d1\u30c3\u30c1\u540d\u306b"{0}"\u3092\u542b\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/impl/Bundle_ja.properties
index 507624a..f084a1f 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/shelve/impl/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Menu_ShelveChanges=\u5909\u66f4\u3092\u30b7\u30a7\u30eb\u30d6(&S)
 CTL_MenuItem_UnshelveChanges=\u5909\u66f4\u306e\u30a2\u30f3\u30b7\u30a7\u30eb\u30d6(&U)...
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/Bundle_ja.properties
index 16a8030..55b5859 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u306e\u30b5\u30dd\u30fc\u30c8\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/common/Bundle_ja.properties
index 2b34ac7..8586e8c 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/common/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_CommitDialog_Title = \u30b3\u30df\u30c3\u30c8 - {0}
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/options/Bundle_ja.properties
index a4f6dad..7c0ed3f 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AnnotationColorsPanel.jLabel1.text=\u5f37\u8abf\u8868\u793a(&G):
 AnnotationColorsPanel.jLabel3.text=\u8272(&C):
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/projects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/projects/Bundle_ja.properties
index d8752d7..6c36172 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/projects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/projects/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CHECKOUT_ACSD_Completed_Dialog = \u3053\u306e\u30c0\u30a4\u30a2\u30ed\u30b0\u3067\u306f\u3001SVN\u304b\u3089\u6b63\u3057\u304f\u30bd\u30fc\u30b9\u3092\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8\u3057\u305f\u3042\u3068\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/status/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/status/Bundle_ja.properties
index f39aebe..26f60de 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/status/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning-util/versioning-util/org/netbeans/modules/versioning/util/status/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #VCSStatusNode
 LBL_Path.DisplayName=\u30d1\u30b9
diff --git a/netbeans-l10n-zip/src/ja/ide/versioning/versioning/org/netbeans/modules/versioning/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/versioning/versioning/org/netbeans/modules/versioning/Bundle_ja.properties
index 248511f..5266e11 100755
--- a/netbeans-l10n-zip/src/ja/ide/versioning/versioning/org/netbeans/modules/versioning/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/versioning/versioning/org/netbeans/modules/versioning/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
 OpenIDE-Module-Display-Category=\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/api/Bundle_ja.properties
index 9d1e873..5ce1a1d 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - browser name
 BrowserUISupport.browser.name.integrated=NetBeans Connector\u7d44\u8fbc\u307f\u306e{0}
diff --git a/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/ui/Bundle_ja.properties
index 6646910..d7612c1 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ResizeOptionsCustomizer.lblTable.text=\u8868\u793a\u30b5\u30a4\u30ba:
 ResizeOptionsCustomizer.btnNew.text=\u65b0\u898f
diff --git a/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/ui/picker/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/ui/picker/Bundle_ja.properties
index 9814151..77279db 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/ui/picker/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-browser-api/web-browser-api/org/netbeans/modules/web/browser/ui/picker/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ActiveBrowserAction.reg.name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d6\u30e9\u30a6\u30b6\u306e\u8a2d\u5b9a
 Header_BROWSER=\u30d6\u30e9\u30a6\u30b6
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/Bundle_ja.properties
index b4f4bea..019438c 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ImportantFilesNode.name=\u91cd\u8981\u306a\u30d5\u30a1\u30a4\u30eb
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=Web
 OpenIDE-Module-Name=Web\u5171\u901aUI
 OpenIDE-Module-Short-Description=\u69d8\u3005\u306a"Web\u95a2\u9023"\u5171\u901aUI\u6a5f\u80fd\u3092\u63d0\u4f9b\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/api/Bundle_ja.properties
index 6d576bb..0181bbc 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ExternalExecutableValidator.validateFile.file=\u30d5\u30a1\u30a4\u30eb
 # {0} - source
 ExternalExecutableValidator.validateFile.missing={0}\u3092\u9078\u629e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/cssprep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/cssprep/Bundle_ja.properties
index 212b26a..8d0f916 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/cssprep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/cssprep/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CssPreprocessorsCustomizer.displayName=CSS\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5
 # options
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/refactoring/Bundle_ja.properties
index 736f3a0..6d12970 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common-ui/web-common-ui/org/netbeans/modules/web/common/ui/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Rename=\u540d\u524d\u5909\u66f4
 LBL_FolderRefactoring=\u540d\u524d\u306e\u5909\u66f4\u306e\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_ja.properties
index becde59..64a8501 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 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
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/api/Bundle_ja.properties
index 5e0ec5c..db51174 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
 # when a browser is used
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/cssprep/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/cssprep/Bundle_ja.properties
index 212b26a..8d0f916 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/cssprep/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/cssprep/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CssPreprocessorsCustomizer.displayName=CSS\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5
 # options
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/refactoring/Bundle_ja.properties
index 736f3a0..6d12970 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Rename=\u540d\u524d\u5909\u66f4
 LBL_FolderRefactoring=\u540d\u524d\u306e\u5909\u66f4\u306e\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/remote/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/remote/Bundle_ja.properties
index 4b69d9e..0b77071 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/remote/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/remote/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_RemoteFiles=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb
 RemoteFSDisplayName=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0
 
diff --git a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/ui/Bundle_ja.properties
index bed53fe..a6b0746 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-common/web-common/org/netbeans/modules/web/common/ui/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ImportantFilesNode.name=\u91cd\u8981\u306a\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ide/web-indent/web-indent/org/netbeans/modules/web/indent/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-indent/web-indent/org/netbeans/modules/web/indent/Bundle_ja.properties
index 6cf7de9..2426876 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-indent/web-indent/org/netbeans/modules/web/indent/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-indent/web-indent/org/netbeans/modules/web/indent/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Name=\u30a8\u30c7\u30a3\u30bf\u30fb\u30a4\u30f3\u30c7\u30f3\u30c8\u62e1\u5f35
 OpenIDE-Module-Short-Description=\u57fa\u672c\u30a8\u30c7\u30a3\u30bf\u30fb\u30a4\u30f3\u30c7\u30f3\u30c8\u306e\u62e1\u5f35\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/web-webkit-debugging/web-webkit-debugging/org/netbeans/modules/web/webkit/debugging/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-webkit-debugging/web-webkit-debugging/org/netbeans/modules/web/webkit/debugging/Bundle_ja.properties
index bc6e650..6730bcb 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-webkit-debugging/web-webkit-debugging/org/netbeans/modules/web/webkit/debugging/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-webkit-debugging/web-webkit-debugging/org/netbeans/modules/web/webkit/debugging/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-#
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Web
 OpenIDE-Module-Name=WebKit\u306e\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/ide/web-webkit-debugging/web-webkit-debugging/org/netbeans/modules/web/webkit/debugging/api/debugger/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/web-webkit-debugging/web-webkit-debugging/org/netbeans/modules/web/webkit/debugging/api/debugger/Bundle_ja.properties
index 71af29f..1fcfeb6 100755
--- a/netbeans-l10n-zip/src/ja/ide/web-webkit-debugging/web-webkit-debugging/org/netbeans/modules/web/webkit/debugging/api/debugger/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/web-webkit-debugging/web-webkit-debugging/org/netbeans/modules/web/webkit/debugging/api/debugger/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TYPE_BOOLEAN=\u30d6\u30fc\u30eb
 TYPE_FUNCTION=\u95a2\u6570
 TYPE_NUMBER=\u6570\u5024
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-axi/xml-axi/org/netbeans/modules/xml/axi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-axi/xml-axi/org/netbeans/modules/xml/axi/Bundle_ja.properties
index 4b10648..c582ba0 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-axi/xml-axi/org/netbeans/modules/xml/axi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-axi/xml-axi/org/netbeans/modules/xml/axi/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Display-Category=XML
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/Bundle_ja.properties
index 4b95316..49acc5a 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## CatalogEntryBeanInfo.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/impl/res/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/impl/res/Bundle_ja.properties
index 5ff211d..64c5106 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/impl/res/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/impl/res/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## SystemCatalogCustomizer.java
 SystemCatalogCustomizer.readOnly.text=\u3053\u308c\u306fNetBeans IDE\u30b7\u30b9\u30c6\u30e0\u30fb\u30ab\u30bf\u30ed\u30b0\u3067\u3059\u3002\n\u30e6\u30fc\u30b6\u30fc\u306b\u5bfe\u3057\u3066\u306f\u8aad\u53d6\u308a\u5c02\u7528\u3067\u3059\u3002\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u3088\u3063\u3066\u7de8\u96c6\u304c\u884c\u308f\u308c\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/impl/sun/res/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/impl/sun/res/Bundle_ja.properties
index 865d738..2236ecf 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/impl/sun/res/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/impl/sun/res/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## CatalogCustomizer.java
 ACSD_CatalogCustomizer=OASIS XML\u30ab\u30bf\u30ed\u30b0\u3001XCatalog v0.2\u3001\u304a\u3088\u3073TR9401\u306eXML\u95a2\u9023\u30bb\u30af\u30b7\u30e7\u30f3\u306eOracle\u3067\u306e\u5b9f\u88c5\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30b6
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/ui/Bundle_ja.properties
index 27358e0..b95734d 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=XML
 OpenIDE-Module-Long-Description=\u30e2\u30b8\u30e5\u30fc\u30eb\u3067XML\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30ab\u30bf\u30ed\u30b0\u30fb\u30e6\u30fc\u30b6\u30fc\u30fb\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u304c\u63d0\u4f9b\u3055\u308c\u307e\u3059
 OpenIDE-Module-Name=XML\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30ab\u30bf\u30ed\u30b0UI
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/user/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/user/Bundle_ja.properties
index 7eb40e7..6893b6a 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/user/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog-ui/xml-catalog-ui/org/netbeans/modules/xml/catalog/user/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_userCatalog=\u30e6\u30fc\u30b6\u30fc\u30fb\u30ab\u30bf\u30ed\u30b0
 HINT_userCatalog=\u30ed\u30fc\u30ab\u30eb\u306eDTD\u3084XML\u30b9\u30ad\u30fc\u30de\u3092\u767b\u9332\u3057\u305f\u308a\u3001\u305d\u306e\u5185\u5bb9\u3092\u8868\u793a\u3057\u305f\u308a\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/Bundle_ja.properties
index 4b95316..49acc5a 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## CatalogEntryBeanInfo.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/impl/Bundle_ja.properties
index 8b1cbc8..38dd516 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## XCatalog.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/impl/sun/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/impl/sun/Bundle_ja.properties
index 5e86628..2a9f531 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/impl/sun/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/impl/sun/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## Catalog.java
 #{0} is a catalog location
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/lib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/lib/Bundle_ja.properties
index c32c464..696bfbc 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/lib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/lib/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## Util
 PROP_catalog_mask=\u30ab\u30bf\u30ed\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/Bundle_ja.properties
index 65e87cb..e0dc6c9 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## xml/catalog/manifest.mf
 OpenIDE-Module-Name=XML\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30ab\u30bf\u30ed\u30b0
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/templates/XMLCatalog_ja.html b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/templates/XMLCatalog_ja.html
index de9b57a..0096d90 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/templates/XMLCatalog_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/resources/templates/XMLCatalog_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/settings/Bundle_ja.properties
index 0fc2156..7a6c9ec 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/settings/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Sample ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/user/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/user/Bundle_ja.properties
index 7eb40e7..6893b6a 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/user/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-catalog/xml-catalog/org/netbeans/modules/xml/catalog/user/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_userCatalog=\u30e6\u30fc\u30b6\u30fc\u30fb\u30ab\u30bf\u30ed\u30b0
 HINT_userCatalog=\u30ed\u30fc\u30ab\u30eb\u306eDTD\u3084XML\u30b9\u30ad\u30fc\u30de\u3092\u767b\u9332\u3057\u305f\u308a\u3001\u305d\u306e\u5185\u5bb9\u3092\u8868\u793a\u3057\u305f\u308a\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/api/Bundle_ja.properties
index dc5a24d..dedd4f7 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Null_Project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002UTF-8\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
 Null_FEQ=\u30d5\u30a1\u30a4\u30eb\u30fb\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u306e\u554f\u5408\u305b\u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002UTF-8\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/core/lib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/core/lib/Bundle_ja.properties
index 14844e7..05214f8 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/core/lib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/core/lib/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Encoding display names taken from TAx library
 NAME_ISO-8859-1=ISO-8859-1 (Latin 1)
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/core/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/core/resources/Bundle_ja.properties
index 62d84fd..65da53c 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/core/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-core/xml-core/org/netbeans/modules/xml/core/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## xml/core/manifest.mf
 OpenIDE-Module-Name=XML\u30b3\u30a2
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-jaxb-api/xml-jaxb-api/org/netbeans/modules/xml/jaxb/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-jaxb-api/xml-jaxb-api/org/netbeans/modules/xml/jaxb/api/Bundle_ja.properties
index b2bcde2..7200e08 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-jaxb-api/xml-jaxb-api/org/netbeans/modules/xml/jaxb/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-jaxb-api/xml-jaxb-api/org/netbeans/modules/xml/jaxb/api/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Name=JAXB API
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-lexer/xml-lexer/org/netbeans/api/xml/lexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-lexer/xml-lexer/org/netbeans/api/xml/lexer/Bundle_ja.properties
index e17bf61..50e82c4 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-lexer/xml-lexer/org/netbeans/api/xml/lexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-lexer/xml-lexer/org/netbeans/api/xml/lexer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=XML
 OpenIDE-Module-Long-Description=XML\u8a00\u8a9e\u306e\u5b57\u53e5\u30c8\u30fc\u30af\u30f3\u5b9a\u7fa9\u3068\u3001XML\u8a00\u8a9e\u3092\u8a8d\u8b58\u3059\u308b\u30ec\u30af\u30b5\u30fc\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-multiview/xml-multiview/org/netbeans/modules/xml/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-multiview/xml-multiview/org/netbeans/modules/xml/multiview/Bundle_ja.properties
index 43651f0..66adf0c 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-multiview/xml-multiview/org/netbeans/modules/xml/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-multiview/xml-multiview/org/netbeans/modules/xml/multiview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Module manifest localization
 OpenIDE-Module-Name=XML\u30de\u30eb\u30c1\u30d3\u30e5\u30fc\u30fb\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-multiview/xml-multiview/org/netbeans/modules/xml/multiview/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-multiview/xml-multiview/org/netbeans/modules/xml/multiview/ui/Bundle_ja.properties
index 006a83f..76c135f 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-multiview/xml-multiview/org/netbeans/modules/xml/multiview/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-multiview/xml-multiview/org/netbeans/modules/xml/multiview/ui/Bundle_ja.properties
@@ -1,46 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Add=\u8ffd\u52a0(&A)...
 HINT_Add=\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-retriever/xml-retriever/org/netbeans/modules/xml/retriever/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-retriever/xml-retriever/org/netbeans/modules/xml/retriever/Bundle_ja.properties
index 863b60b..7c9a3e6 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-retriever/xml-retriever/org/netbeans/modules/xml/retriever/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-retriever/xml-retriever/org/netbeans/modules/xml/retriever/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=XML
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001XML\u30b9\u30ad\u30fc\u30de\u3068WSDL\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u30af\u30ed\u30fc\u30b8\u30e3\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u306e\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3\u3068\u3001XML\u30ab\u30bf\u30ed\u30b0\u3092\u64cd\u4f5c\u3059\u308b\u305f\u3081\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-retriever/xml-retriever/org/netbeans/modules/xml/retriever/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-retriever/xml-retriever/org/netbeans/modules/xml/retriever/impl/Bundle_ja.properties
index 585f971..e0758fb 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-retriever/xml-retriever/org/netbeans/modules/xml/retriever/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-retriever/xml-retriever/org/netbeans/modules/xml/retriever/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #CertificationPanel
 TTL_CertifiedWebSite=\u4e0d\u660e\u306a\u8a8d\u8a3c\u6a5f\u95a2\u306b\u3088\u3063\u3066\u8a8d\u8a3c\u3055\u308c\u305fWeb\u30b5\u30a4\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-schema-completion/xml-schema-completion/org/netbeans/modules/xml/schema/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-schema-completion/xml-schema-completion/org/netbeans/modules/xml/schema/completion/Bundle_ja.properties
index e8c72ca..d76ee56 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-schema-completion/xml-schema-completion/org/netbeans/modules/xml/schema/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-schema-completion/xml-schema-completion/org/netbeans/modules/xml/schema/completion/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Display-Category=XML
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/Bundle_ja.properties
index 4364650..ee3d6ec 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=XML
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001XML\u30b9\u30ad\u30fc\u30de\u30fb\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u64cd\u4f5c\u3059\u308b\u305f\u3081\u306eAPI\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/impl/Bundle_ja.properties
index 43af9fe..2ae7f84 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ModelSourceNotWellFormed=\u53c2\u7167\u5148\u306e\u30e2\u30c7\u30eb\u30fb\u30bd\u30fc\u30b9{0}\u306f\u6574\u5f62\u5f0f\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/validation/Bundle_ja.properties
index 11f7ee9..9e0e06b 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-schema-model/xml-schema-model/org/netbeans/modules/xml/schema/model/validation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Schema_Validator=\u30b9\u30ad\u30fc\u30de\u30fb\u30d0\u30ea\u30c7\u30fc\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/Bundle_ja.properties
index 53071cd..4f4f9ce 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #
 # org.netbeans.tax.TreeUtilities
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/io/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/io/Bundle_ja.properties
index bd10c63..375fcc0 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/io/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/io/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #org.netbeans.tax.io.TreeReader
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/traversal/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/traversal/Bundle_ja.properties
index 65f04c5..22b1984 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/traversal/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tax/ext/org-netbeans-tax/org/netbeans/tax/traversal/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # empty no resources to L10N
 
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/Bundle_ja.properties
index 6df340f..8530dc1 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## Lib.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/customizer/Bundle_ja.properties
index 163334d..f584c18 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/editor/Bundle_ja.properties
index 8aed290..fab0bcf 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/beans/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## a11y - TreeElementAttributeListCustomizer
 
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/cookies/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/cookies/Bundle_ja.properties
index de479b8..fe408ba 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/cookies/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/cookies/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## TreeEditorCookieImpl.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/parser/Bundle_ja.properties
index 1101e41..c0e4bf0 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/parser/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## ParsingSupport.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/resources/Bundle_ja.properties
index 69505ae..aaa0a51 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tax/xml-tax/org/netbeans/modules/xml/tax/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## xml/tax/manifest.mf
 OpenIDE-Module-Name=TAX\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/breadcrumbs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/breadcrumbs/Bundle_ja.properties
index 5b1b5dc..fac60bd 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/breadcrumbs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/breadcrumbs/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LABEL_CDATA=<i>CDATA</i>
 LABEL_DOCTYPE=<i>DOCTYPE</i>
 
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/completion/Bundle_ja.properties
index b46c66b..4b7f814 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## XMLCompletionQuery.java
 #0 represents filtering prefix
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/folding/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/folding/Bundle_ja.properties
index 9c7f4a4..faa31b5 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/folding/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/folding/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_PI=\u51e6\u7406\u547d\u4ee4
 LBL_CDATA=CDATA\u30bb\u30af\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/indent/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/indent/Bundle_ja.properties
index 6453cde..40c634f 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/indent/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/indent/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## XMLIndentEngineBeanInfo.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/navigator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/navigator/Bundle_ja.properties
index b29dbbc..53df9c4 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/navigator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/navigator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Filter=\u30d5\u30a3\u30eb\u30bf:
 LBL_ShowAttributes=\u5c5e\u6027\u3092\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/navigator/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/navigator/base/Bundle_ja.properties
index a4b09bc..641520a 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/navigator/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/navigator/base/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_Wait=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
 LBL_Scan=\u30b9\u30ad\u30e3\u30f3\u4e2d...
 LBL_CannotNavigate=<\u30ca\u30d3\u30b2\u30fc\u30c8\u3067\u304d\u307e\u305b\u3093>
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/resources/Bundle_ja.properties
index defe234..5b84e12 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest.mf
 OpenIDE-Module-Name=XML\u30c6\u30ad\u30b9\u30c8\u30fb\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/syntax/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/syntax/Bundle_ja.properties
index 42fca71..cc129e1 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/syntax/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-text/xml-text/org/netbeans/modules/xml/text/syntax/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## XMLOptions.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/actions/Bundle_ja.properties
index a37ba3d..273dacc 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## CSSStyleAction.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/doclet/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/doclet/Bundle_ja.properties
index e964d5c..4361b3b 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/doclet/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/doclet/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## DTDDoclet.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/generator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/generator/Bundle_ja.properties
index 8e6cdd0..8cba229 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/generator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/generator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## GenerateDTDSupport.java
 MSG_use_dtd_as_document_type?=\u751f\u6210\u3055\u308c\u305fDTD\u3092\u5916\u90e8\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u578b\u3068\u3057\u3066\u4f7f\u7528\u3057\u307e\u3059\u304b?
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/resources/Bundle_ja.properties
index 3dedb14..e11284e 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-tools/xml-tools/org/netbeans/modules/xml/tools/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## xml/tools/manifest.mf
 OpenIDE-Module-Name=XML\u751f\u7523\u6027\u30c4\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/Bundle_ja.properties
index fa193ed..4e1c259 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=XML
 OpenIDE-Module-Long-Description=WebService Description Language\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u305f\u3081\u306eAPI\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle_ja.properties
index 592097c..b9c7188 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/http/validation/Bundle_ja.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-# Package specific ResourceBundle properties file
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 HTTPBindingValidator.One_binding_allowed=\u7d50\u5408\u3054\u3068\u306b<http:binding>\u8981\u7d20\u304c1\u3064\u3060\u3051\u8a31\u53ef\u3055\u308c\u307e\u3059\u3002
 HTTPBindingValidator.Verb_required=<http:binding>\u8981\u7d20\u3067\u306f\u3001"GET"\u307e\u305f\u306f"POST"\u306e\u3069\u3061\u3089\u306e\u5024\u3067\u3082\u3001verb\u5c5e\u6027\u304c\u5fc5\u8981\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle_ja.properties
index 8a7045f..59550c1 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Package specific ResourceBundle properties file
 
 AP2901_INPUT=WS-I(AP2901): <wsdl:input>\u306f\u3001WSDL 1.1\u30bb\u30af\u30b7\u30e7\u30f35 WSDL\u306b\u8a18\u8ff0\u3055\u308c\u305fMIME\u7d50\u5408\u3001\u307e\u305f\u306fWSDL 1.1\u30bb\u30af\u30b7\u30e7\u30f33\u306b\u8a18\u8ff0\u3055\u308c\u305fWSDL SOAP\u7d50\u5408\u306e\u3001\u3044\u305a\u308c\u3082\u4f7f\u7528\u3057\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle_ja.properties
index 8b8c84b..d2284f1 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/soap/validation/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Package specific ResourceBundle properties file
 
 SOAPBindingValidator.Transport_URI_required=<soap:binding>\u8981\u7d20\u3067\u306f\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8URI\u304c\u5fc5\u8981\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle_ja.properties
index 0219b37..d1b5f4b 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/extensions/soap12/validation/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Package specific ResourceBundle properties file
 
 SOAPBindingValidator.Transport_URI_required=<soap:binding>\u8981\u7d20\u3067\u306f\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8URI\u304c\u5fc5\u8981\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/impl/Bundle_ja.properties
index f65f763..dd3094c 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/model/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_CannotResolve={0}\u53c8\u306f{1}\u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093
 MSG_CANNOT_LOAD_WSDL={0}\u3067WSDL\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/validator/visitor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/validator/visitor/Bundle_ja.properties
index 0357eb6..08ef3dd 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/validator/visitor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/validator/visitor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ResourceBundle properties file
 # {0} tag name
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/validator/visitor/schema/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/validator/visitor/schema/Bundle_ja.properties
index c2e9a27..825d83e 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/validator/visitor/schema/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-wsdl-model/xml-wsdl-model/org/netbeans/modules/xml/wsdl/validator/visitor/schema/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Schema_Validator=\u30b9\u30ad\u30fc\u30de\u30fb\u30d0\u30ea\u30c7\u30fc\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-xam/xml-xam/org/netbeans/modules/xml/xam/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-xam/xml-xam/org/netbeans/modules/xml/xam/Bundle_ja.properties
index 80f2473..0c9f4c5 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-xam/xml-xam/org/netbeans/modules/xml/xam/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-xam/xml-xam/org/netbeans/modules/xml/xam/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=XML
 OpenIDE-Module-Long-Description=XAM (Extensible Abstract Model)\u306f\u3001\u3042\u3089\u3086\u308b\u57fa\u672c\u30e2\u30c7\u30eb\u306e\u4e0a\u4f4d\u306b\u4f4d\u7f6e\u3059\u308b\u3001\u30c9\u30e1\u30a4\u30f3\u56fa\u6709\u306e\u8ad6\u7406\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30fb\u30e2\u30c7\u30eb\u3092\u30d3\u30eb\u30c9\u3059\u308b\u305f\u3081\u306e\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3067\u3059\u3002\n\nXAM\u306b\u306fXML W3\u6a19\u6e96DOM\u69cb\u6587\u30c4\u30ea\u30fc\u306e\u30b5\u30dd\u30fc\u30c8\u304c\u7d44\u307f\u8fbc\u307e\u308c\u3066\u304a\u308a\u3001\u57fa\u790e\u3068\u306a\u3063\u3066\u3044\u308bXDM (XML Document Model)\u3068\u30b9\u30e0\u30fc\u30ba\u306b\u7d71\u5408\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u7d71\u5408\u306b\u3088\u3063\u3066\u3001XAM\u306b\u57fa\u3065\u304f\u30e2\u30c7\u30eb\u306f\u3001\u5236\u9650\u306e\u306a\u3044\u53d6\u6d88\u3057\u3084\u3084\u308a\u76f4\u3057\u306b\u3088\u308b\u52b9\u7387\u7684\u306a\u5909\u66f4\u3001\u3059\u3079\u3066\u306e\u30e2\u30c7\u30eb\u30fb\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u9045\u5ef6\u30ed\u30fc\u30c9\u3001\u30bd\u30fc\u30b9\u306e\u5909\u66f4\u306b\u4f34\u3046\u81ea\u52d5\u540c\u671f\u3001\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u6b63\u78ba\u3055\u306e\u7dad\u6301\u306a\u3069\u304c\u53ef\u80fd\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002\u3053\u306e\u307b\u304b\u3001\u30b9\u30ad\u30fc\u30de\u306b\u57fa\u3065\u304f\u30bb\u30de\u30f3\u30c6\u30a3\u30af\u306e\u691c\u8a3c\u3092\u52a0\u3048\u308b\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3068\u540c\u69d8\u306b\u3001\u540d\u524d\u7a7a\u9593\u306b\u57fa\u3065\u304f\u5185\u90e8\u53c2\u7167\u304a\u3088\u3073\u5916\u90e8\u53c2\u7167\u3092\u89e3\u6c7a\u3059\u308b\u6a5f\u80fd\u3082\u5099\u3048\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-xam/xml-xam/org/netbeans/modules/xml/xam/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-xam/xml-xam/org/netbeans/modules/xml/xam/spi/Bundle_ja.properties
index 17b7401..b24ec7c 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-xam/xml-xam/org/netbeans/modules/xml/xam/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-xam/xml-xam/org/netbeans/modules/xml/xam/spi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_NoSAXSource=\u30e2\u30c7\u30eb\u30fb\u30bd\u30fc\u30b9\u3067\u306f\u3001javax.xml.transform.Source\u306flookup\u5185\u3067\u63d0\u4f9b\u3055\u308c\u305a\u3001\u76f8\u5bfe\u7684\u306a\u30ea\u30bd\u30fc\u30b9\u89e3\u6c7a\u306f\u5fc5\u8981\u3068\u3055\u308c\u3066\u3082\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/nodes/Bundle_ja.properties
index 8d3f84d..cb799f8 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## Convertors.java
 # Encoding display names taken from TAX library
diff --git a/netbeans-l10n-zip/src/ja/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/resources/Bundle_ja.properties
index 1588c3e..373e49f 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml-xdm/xml-xdm/org/netbeans/modules/xml/xdm/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=XDM\u306fXML DOM\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3092\u30b5\u30dd\u30fc\u30c8\u3059\u308b\u9053\u5177\u3068\u3057\u3066\u5229\u7528\u53ef\u80fd\u306aXML\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u30fb\u30e2\u30c7\u30eb\u3067\u3059\u3002
 OpenIDE-Module-Name=XML\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30e2\u30c7\u30eb(XDM)
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/Bundle_ja.properties
index 3110c12..bc263be 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## DTDDataLoader.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/actions/Bundle_ja.properties
index 03aa791..511f392 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## CollectDTDAction.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/cookies/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/cookies/Bundle_ja.properties
index ceab901..a8f9913 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/cookies/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/cookies/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## ScenarioSupport.java
 NAME_customize_scenarios_title=\u30b7\u30ca\u30ea\u30aa\u30fb\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/lib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/lib/Bundle_ja.properties
index 28500cf..39e262a 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/lib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/lib/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## FileUtilities
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/Bundle_ja.properties
index a4d1927..d25455b 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=XML\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=XML
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/XMLWizard_ja.html b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/XMLWizard_ja.html
index 9ddb28d..ac133c1 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/XMLWizard_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/XMLWizard_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/emptyDTD_ja.html b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/emptyDTD_ja.html
index 228380f..f10ecbe 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/emptyDTD_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/emptyDTD_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/emptySchema_ja.html b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/emptySchema_ja.html
index 65a24e1..3750a05 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/emptySchema_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/emptySchema_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/xhtml_ja.html b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/xhtml_ja.html
index b5c739d..10a5f46 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/xhtml_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/xhtml_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/xml_entity_ja.html b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/xml_entity_ja.html
index d6f849c..108d823 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/xml_entity_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/resources/xml_entity_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/sync/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/sync/Bundle_ja.properties
index 9362f27..8ee3516 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/sync/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/sync/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## FileRepresentation.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/text/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/text/Bundle_ja.properties
index 6a70fa0..13ddb34 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/text/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/text/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## TextEditorSupport.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/tree/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/tree/Bundle_ja.properties
index 8c87c65..da1aca0 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/tree/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/tree/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## ParsingSupport.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/util/Bundle_ja.properties
index 56c7888..7cc5300 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## FileUtilities
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/wizard/Bundle_ja.properties
index bef74be..ad28d59 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PROP_xml_content_panel_name=XML\u30e2\u30c7\u30eb\u751f\u6210\u30aa\u30d7\u30b7\u30e7\u30f3 
 XMLContentPanel.titleLabel.text=XML\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306b\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u5185\u5bb9\u3092\u542b\u3081\u308b\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/wizard/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/wizard/impl/Bundle_ja.properties
index 17aea2b..138ab33 100755
--- a/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/wizard/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xml/xml/org/netbeans/modules/xml/wizard/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TITLE_x_of_y={0}/{1}
 PROP_schema_panel_name=\u30b9\u30ad\u30fc\u30de\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/Bundle_ja.properties
index f308510..c5256b2 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## XSLDataLoader, XSLDataLoaderBeanInfo
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/actions/Bundle_ja.properties
index c6e6ca4..d2532da 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## TransformAction.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/cookies/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/cookies/Bundle_ja.properties
index e1ce1ed..5886c61 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/cookies/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/cookies/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## ValidateXSLSupport
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/grammar/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/grammar/Bundle_ja.properties
index 5ee9347..0cd460f 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/grammar/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/grammar/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## XMLQueryProvider.java
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/resources/Bundle_ja.properties
index ca317e8..c8df102 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## xml/xsl/manifest.mf
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/resources/templates/stylesheet_ja.html b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/resources/templates/stylesheet_ja.html
index 70817d3..f50ec8a 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/resources/templates/stylesheet_ja.html
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/resources/templates/stylesheet_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/transform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/transform/Bundle_ja.properties
index 7e8fe99..dacdc1d 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/transform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/transform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## TransformServlet
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/ui/Bundle_ja.properties
index 7ecdc28..ce0974c 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_XML_input=XML\u30bd\u30fc\u30b9:
 
 LBL_browse_file=\u53c2\u7167...
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/utils/Bundle_ja.properties
index c8b2c44..be94f93 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/utils/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} class name
 BK000={0}\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059 - \u30c7\u30d5\u30a9\u30eb\u30c8JRE XSLT\u30d7\u30ed\u30bb\u30c3\u30b5\u3002
diff --git a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/wizard/Bundle_ja.properties
index d4a4368..3dc04f7 100755
--- a/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ide/xsl/xsl/org/netbeans/modules/xsl/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## mf-layer.xml
 Templates/XML/stylesheet.xsl=XSL\u30b9\u30bf\u30a4\u30eb\u30fb\u30b7\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/ant-browsetask/ant-browsetask/org/netbeans/modules/ant/browsetask/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/ant-browsetask/ant-browsetask/org/netbeans/modules/ant/browsetask/Bundle_ja.properties
index 4abf56e..84efe56 100755
--- a/netbeans-l10n-zip/src/ja/java/ant-browsetask/ant-browsetask/org/netbeans/modules/ant/browsetask/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/ant-browsetask/ant-browsetask/org/netbeans/modules/ant/browsetask/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Web\u30d6\u30e9\u30a6\u30b6Ant\u30bf\u30b9\u30af
 OpenIDE-Module-Display-Category=Web
diff --git a/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/Bundle_ja.properties
index ed199cb..eb6b564 100755
--- a/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_debug_target=\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/breakpoints/Bundle_ja.properties
index 4014b2d..e640226 100755
--- a/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LineBrkp_Type=\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/resources/Bundle_ja.properties
index b15e4fd..2d7ec71 100755
--- a/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/ant-debugger/ant-debugger/org/netbeans/modules/ant/debugger/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #Annotations
diff --git a/netbeans-l10n-zip/src/ja/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/Bundle_ja.properties
index 8e2badc..a826f22 100755
--- a/netbeans-l10n-zip/src/ja/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u81ea\u7531\u5f62\u5f0f\u3067\u306eAnt\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 OpenIDE-Module-Display-Category=\u30c4\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/ui/Bundle_ja.properties
index fce96d0..27dbdb8 100755
--- a/netbeans-l10n-zip/src/ja/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/ant-freeform/ant-freeform/org/netbeans/modules/ant/freeform/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Customizer_Ok_Option=OK
 LBL_Customizer_Cancel_Option=\u53d6\u6d88
diff --git a/netbeans-l10n-zip/src/ja/java/ant-grammar/ant-grammar/org/netbeans/modules/ant/grammar/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/ant-grammar/ant-grammar/org/netbeans/modules/ant/grammar/Bundle_ja.properties
index 64c45d1..1d11f27 100755
--- a/netbeans-l10n-zip/src/ja/java/ant-grammar/ant-grammar/org/netbeans/modules/ant/grammar/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/ant-grammar/ant-grammar/org/netbeans/modules/ant/grammar/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Ant\u30b3\u30fc\u30c9\u88dc\u5b8c
 OpenIDE-Module-Display-Category=\u30c4\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/java/ant-kit/ant-kit/org/netbeans/modules/ant/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/ant-kit/ant-kit/org/netbeans/modules/ant/kit/Bundle_ja.properties
index 00c4648..a02ab4b 100755
--- a/netbeans-l10n-zip/src/ja/java/ant-kit/ant-kit/org/netbeans/modules/ant/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/ant-kit/ant-kit/org/netbeans/modules/ant/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java SE
 OpenIDE-Module-Long-Description=IDE\u3067\u306eApache Ant\u30d3\u30eb\u30c9\u30fb\u30c4\u30fc\u30eb\u306e\u57fa\u672c\u7d71\u5408\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002Ant\u30b9\u30af\u30ea\u30d7\u30c8\u306e\u7de8\u96c6\u3068\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u5b9f\u884c\u306e\u30b5\u30dd\u30fc\u30c8\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002\u81ea\u7531\u5f62\u5f0fAnt\u30d9\u30fc\u30b9\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3\u3068\u3001\u3055\u307e\u3056\u307e\u306a\u7a2e\u985e\u306eAnt\u30d9\u30fc\u30b9\u306eJava\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u4f7f\u7528\u3059\u308b\u7279\u5225\u306a\u30bf\u30b9\u30af\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Ant
diff --git a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/Bundle_ja.properties
index 7bbf359..275857b 100755
--- a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Nodes
 Error=\u30a8\u30e9\u30fc
diff --git a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/addproperty/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/addproperty/Bundle_ja.properties
index 5fbeff3..c157691 100755
--- a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/addproperty/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/addproperty/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 AddPropertyPanel.nameLabel.text=\u540d\u524d(&N):
 
 AddPropertyPanel.typeLabel.text=\u30bf\u30a4\u30d7(&T):
diff --git a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/beaninfo/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/beaninfo/Bundle_ja.properties
index ceb4215..3b3730f 100755
--- a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/beaninfo/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/beaninfo/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/BeanInfo_ja.html b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/BeanInfo_ja.html
index 27f06d4..93b38f0 100755
--- a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/BeanInfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/BeanInfo_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Bean_ja.html b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Bean_ja.html
index 5bb7c44..2f01d7d 100755
--- a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Bean_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Bean_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Beans_ja.html b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Beans_ja.html
index 85833a2..b62aec9 100755
--- a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Beans_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Beans_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Customizer_ja.html b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Customizer_ja.html
index 1dd1d92..4ab579a 100755
--- a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Customizer_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/Customizer_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/PropertyEditor_ja.html b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/PropertyEditor_ja.html
index f0c3087..e06f286 100755
--- a/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/PropertyEditor_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/beans/beans/org/netbeans/modules/beans/resources/templates/PropertyEditor_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/classfile/classfile/org/netbeans/modules/classfile/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/classfile/classfile/org/netbeans/modules/classfile/Bundle_ja.properties
index 01f9ea8..31db7ec 100755
--- a/netbeans-l10n-zip/src/ja/java/classfile/classfile/org/netbeans/modules/classfile/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/classfile/classfile/org/netbeans/modules/classfile/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Bundle_ja.properties
index 8959e73..c304c3c 100755
--- a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DBSchemaConnectionPanel
 NoConnection=<\u63a5\u7d9a\u306a\u3057>
diff --git a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/DBSchema_ja.html b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/DBSchema_ja.html
index 1ab78d4..73a57c1 100755
--- a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/DBSchema_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/DBSchema_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Databases_ja.html b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Databases_ja.html
index 96f7c8d..341aaba 100755
--- a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Databases_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/resources/Databases_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/wizard/Bundle_ja.properties
index 449a11d..f601473 100755
--- a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/jdbcimpl/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_PleaseWait=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044
 MSG_ClosingPrevious=\u524d\u56de\u306e\u63a5\u7d9a\u3092\u5207\u65ad\u4e2d
diff --git a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/nodes/Bundle_ja.properties
index 2c575e8..8619996 100755
--- a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #nodes
 Tables=\u8868
diff --git a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/resources/Bundle_ja.properties
index 93bdb3b..17f4432 100755
--- a/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/dbschema/dbschema/org/netbeans/modules/dbschema/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # TableElement
 FullyQualifiedName=\u8868\u306e\u5b8c\u5168\u4fee\u98fe\u540d\u304c\u5fc5\u8981\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ant/debugger-jpda-ant/org/netbeans/modules/debugger/jpda/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ant/debugger-jpda-ant/org/netbeans/modules/debugger/jpda/ant/Bundle_ja.properties
index 1ea37e6..7f5e54b 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ant/debugger-jpda-ant/org/netbeans/modules/debugger/jpda/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ant/debugger-jpda-ant/org/netbeans/modules/debugger/jpda/ant/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #module descriptions
 OpenIDE-Module-Name=JPDA\u30c7\u30d0\u30c3\u30acAnt\u30bf\u30b9\u30af
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-js/debugger-jpda-js/org/netbeans/modules/debugger/jpda/js/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-js/debugger-jpda-js/org/netbeans/modules/debugger/jpda/js/Bundle_ja.properties
index 22f6017..50123da 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-js/debugger-jpda-js/org/netbeans/modules/debugger/jpda/js/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-js/debugger-jpda-js/org/netbeans/modules/debugger/jpda/js/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # END_COPYRIGHT_NOTICE}
 
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-js/debugger-jpda-js/org/netbeans/modules/debugger/jpda/js/frames/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-js/debugger-jpda-js/org/netbeans/modules/debugger/jpda/js/frames/models/Bundle_ja.properties
index 190775a..b21cd47 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-js/debugger-jpda-js/org/netbeans/modules/debugger/jpda/js/frames/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-js/debugger-jpda-js/org/netbeans/modules/debugger/jpda/js/frames/models/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_DisplayAllJavaFrames=\u3059\u3079\u3066\u306eJava\u30d5\u30ec\u30fc\u30e0\u306e\u8868\u793a
 MSG_NoSourceInfo=\u4f7f\u7528\u53ef\u80fd\u306a\u30bd\u30fc\u30b9\u60c5\u5831\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-jsui/debugger-jpda-jsui/org/netbeans/modules/debugger/jpda/jsui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-jsui/debugger-jpda-jsui/org/netbeans/modules/debugger/jpda/jsui/Bundle_ja.properties
index ec954cb..0d9a6f9 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-jsui/debugger-jpda-jsui/org/netbeans/modules/debugger/jpda/jsui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-jsui/debugger-jpda-jsui/org/netbeans/modules/debugger/jpda/jsui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # END_COPYRIGHT_NOTICE}
 
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-jsui/debugger-jpda-jsui/org/netbeans/modules/debugger/jpda/jsui/frames/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-jsui/debugger-jpda-jsui/org/netbeans/modules/debugger/jpda/jsui/frames/models/Bundle_ja.properties
index 190775a..b21cd47 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-jsui/debugger-jpda-jsui/org/netbeans/modules/debugger/jpda/jsui/frames/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-jsui/debugger-jpda-jsui/org/netbeans/modules/debugger/jpda/jsui/frames/models/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_DisplayAllJavaFrames=\u3059\u3079\u3066\u306eJava\u30d5\u30ec\u30fc\u30e0\u306e\u8868\u793a
 MSG_NoSourceInfo=\u4f7f\u7528\u53ef\u80fd\u306a\u30bd\u30fc\u30b9\u60c5\u5831\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-kit/debugger-jpda-kit/org/netbeans/modules/debugger/jpda/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-kit/debugger-jpda-kit/org/netbeans/modules/debugger/jpda/kit/Bundle_ja.properties
index e735aaa..bedc279 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-kit/debugger-jpda-kit/org/netbeans/modules/debugger/jpda/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-kit/debugger-jpda-kit/org/netbeans/modules/debugger/jpda/kit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #manifest's description entries
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-projects/debugger-jpda-projects/org/netbeans/modules/debugger/jpda/projects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-projects/debugger-jpda-projects/org/netbeans/modules/debugger/jpda/projects/Bundle_ja.properties
index f417a1c..8154352 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-projects/debugger-jpda-projects/org/netbeans/modules/debugger/jpda/projects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-projects/debugger-jpda-projects/org/netbeans/modules/debugger/jpda/projects/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_NoParseNoEval=\u5f0f\u3092\u8a55\u4fa1\u3067\u304d\u307e\u305b\u3093 - \u89e3\u6790\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 #module descriptions
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-projectsui/debugger-jpda-projectsui/org/netbeans/modules/debugger/jpda/projectsui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-projectsui/debugger-jpda-projectsui/org/netbeans/modules/debugger/jpda/projectsui/Bundle_ja.properties
index c35f519..1e7e5f0 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-projectsui/debugger-jpda-projectsui/org/netbeans/modules/debugger/jpda/projectsui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-projectsui/debugger-jpda-projectsui/org/netbeans/modules/debugger/jpda/projectsui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #module descriptions
 OpenIDE-Module-Name=JPDA\u30c7\u30d0\u30c3\u30ac\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8UI\u306e\u7d71\u5408
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/resources/Bundle_ja.properties
index 95846fb..ddb408a 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/Bundle_ja.properties
index e3e257b..ecdfd12 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #manifest's description entries
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/actions/Bundle_ja.properties
index 4b04f60..f8a959d 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_CheckDeadlocks=\u30c7\u30c3\u30c9\u30ed\u30c3\u30af\u3092\u691c\u67fb(&K)
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/breakpoints/Bundle_ja.properties
index 6da34e8..1a360fc 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #BreakpointTypes
 CTL_Java_breakpoint_events_cathegory_name=Java
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/debugging/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/debugging/Bundle_ja.properties
index 3a83c1d..ad87a0f 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/debugging/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/debugging/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DebuggingViewSupportImpl
 
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/focus/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/focus/Bundle_ja.properties
index 2875279..490734e 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/focus/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/focus/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # AWTGrabHandler
 MSG_GrabNotReleasedDbgKilled=\u30c7\u30d0\u30c3\u30b0\u5bfe\u8c61\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u30e6\u30fc\u30b6\u30fc\u5165\u529b\u3092\u30b0\u30e9\u30d6\u3057\u307e\u3057\u305f\u3002\n\u305f\u3060\u3057\u3001\u30c7\u30d0\u30c3\u30ac\u306f\u305d\u306e\u30b0\u30e9\u30d6\u306e\u89e3\u653e\u4e2d\u306b\u505c\u6b62\u3057\u305f\u305f\u3081\u3001GUI\u3078\u306e\u30a2\u30af\u30bb\u30b9\u3092\u89e3\u653e\u3059\u308b\u305f\u3081\u306b\u30c7\u30d0\u30c3\u30ac\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u7d42\u4e86\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3057\u305f\u3002\n\u30c7\u30d0\u30c3\u30b0\u4e2d\u306f -Dsun.awt.disablegrab=true\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3057\u3066\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u3092\u8003\u616e\u3067\u304d\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle_ja.properties
index 7942a11..c8535ed 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/models/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/options/Bundle_ja.properties
index c9388bb..fed5b69 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_JavaDebugger=Java\u30c7\u30d0\u30c3\u30ac
 HINT_JavaDebugger=Java\u30c7\u30d0\u30c3\u30ac\u306e\u30aa\u30d7\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/views/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/views/Bundle_ja.properties
index 6d5d316..88f2f33 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/views/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-ui/debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/views/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #Variables View buttons
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/Bundle_ja.properties
index 4dc619f..87b185d 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #manifest's description entries
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/actions/Bundle_ja.properties
index a9ffc6e..21c0acf 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_GoToSource=\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u30fb\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
 CTL_GoToFieldDeclaration=\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u5ba3\u8a00\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/breakpoints/Bundle_ja.properties
index 3aa8c79..ffc7f8e 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #BreakpointTypes
 CTL_Java_breakpoint_events_cathegory_name=Java
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/models/Bundle_ja.properties
index d69ef8d..d637e5f 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/models/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_EventsColumnName=\u540d\u524d
 LBL_EventTypesColumnName=\u578b
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/options/Bundle_ja.properties
index e21a69b..bc87573 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Tools Options Java Debugger category
 LBL_VisualDebugging=\u30d3\u30b8\u30e5\u30a2\u30eb\u30fb\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/ui/Bundle_ja.properties
index 51bf16e..b56306e 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ImageFiles=\u753b\u50cf\u30d5\u30a1\u30a4\u30eb
 LBL_DebuggerSnapshot=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/views/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/views/Bundle_ja.properties
index 1a799a3..efe027b 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/views/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda-visual/debugger-jpda-visual/org/netbeans/modules/debugger/jpda/visual/views/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #DebuggerViews
 CTL_Events_view=\u30a4\u30d9\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/Bundle_ja.properties
index 8d67795..f6f637c 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #manifest's description entries
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/actions/Bundle_ja.properties
index ea93a85..2152fed 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 VMDisconnected=\u30a2\u30af\u30b7\u30e7\u30f3\u306f\u5b8c\u4e86\u3057\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30c7\u30d0\u30c3\u30b0\u5bfe\u8c61\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3068\u306e\u63a5\u7d9a\u304c\u5207\u65ad\u3055\u308c\u307e\u3057\u305f\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/breakpoints/Bundle_ja.properties
index 45c41a4..ed0ba6a 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #JDI Internal Error
 MSG_jdi_internal_error=\u30c7\u30d0\u30c3\u30b0\u5bfe\u8c61\u306e\u4eee\u60f3\u30de\u30b7\u30f3\u3067\u5185\u90e8\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u73fe\u5728\u306e\u30c7\u30d0\u30c3\u30b0\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u4e0d\u5b89\u5b9a\u3067\u3042\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u30c7\u30d0\u30c3\u30ac\u3092\u518d\u8d77\u52d5\u3059\u308b\u3053\u3068\u3092\u63a8\u5968\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/console/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/console/Bundle_ja.properties
index 7bc66ac..6b43c6c 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/console/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/console/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_DebuggerConsole_Title = \u30c7\u30d0\u30c3\u30ac\u30fb\u30b3\u30f3\u30bd\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/Bundle_ja.properties
index 7cac10c..2ed2768 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 CTL_UnsupportedOperationException=\u30e1\u30bd\u30c3\u30c9\u547c\u51fa\u3057\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/formatters/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/formatters/Bundle_ja.properties
index defd2c5..76fbefb 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/formatters/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/expr/formatters/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # VariablesFormatter
 MSG_CharSequenceFormatter=\u30c7\u30d5\u30a9\u30eb\u30c8CharSequence\u30d5\u30a9\u30fc\u30de\u30c3\u30bf
 MSG_CollectionFormatter=\u30c7\u30d5\u30a9\u30eb\u30c8Collection\u30d5\u30a9\u30fc\u30de\u30c3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/models/Bundle_ja.properties
index 063851f..7b03ed7 100755
--- a/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/debugger-jpda/debugger-jpda/org/netbeans/modules/debugger/jpda/models/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ObjCollected=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u304c\u56de\u53ce\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 MSG_Disconnected=\u30c7\u30d0\u30c3\u30b0\u5bfe\u8c61\u304c\u5207\u65ad\u3055\u308c\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/findbugs-installer/findbugs-installer/org/netbeans/modules/findbugs/installer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/findbugs-installer/findbugs-installer/org/netbeans/modules/findbugs/installer/Bundle_ja.properties
index f76b3a7..0df327f 100755
--- a/netbeans-l10n-zip/src/ja/java/findbugs-installer/findbugs-installer/org/netbeans/modules/findbugs/installer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/findbugs-installer/findbugs-installer/org/netbeans/modules/findbugs/installer/Bundle_ja.properties
@@ -1,43 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DN_FindBugsIntegration=FindBugs\u7d71\u5408
 FindBugs_Library=FindBugs\u30e9\u30a4\u30d6\u30e9\u30ea
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=FindBugs\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
 FindBugsPanel.jLabel2.text=FindBugs\u306f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 FindBugsPanel.install.text=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/form-binding/form-binding/org/netbeans/modules/form/binding/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-binding/form-binding/org/netbeans/modules/form/binding/Bundle_ja.properties
index 9e1cf82..61b1413 100755
--- a/netbeans-l10n-zip/src/ja/java/form-binding/form-binding/org/netbeans/modules/form/binding/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-binding/form-binding/org/netbeans/modules/form/binding/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d5\u30a9\u30fc\u30e0\u30fb\u30a8\u30c7\u30a3\u30bf\u306eBeans\u306e\u30d0\u30a4\u30f3\u30c9\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Short-Description=2\u3064\u306eJavaBeans\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u540c\u671f\u3092\u7dad\u6301\u3059\u308b\u305f\u3081\u306e\u30d3\u30b8\u30e5\u30a2\u30eb\u30fb\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/form-binding/form-binding/org/netbeans/modules/form/binding/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-binding/form-binding/org/netbeans/modules/form/binding/resources/Bundle_ja.properties
index 0c7c083..39d7a0e 100755
--- a/netbeans-l10n-zip/src/ja/java/form-binding/form-binding/org/netbeans/modules/form/binding/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-binding/form-binding/org/netbeans/modules/form/binding/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # library name
 beans-binding=Beans Binding
diff --git a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/Bundle2_ja.properties b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/Bundle2_ja.properties
index f73c409..df2b3c6 100755
--- a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/Bundle2_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/Bundle2_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest localization
 OpenIDE-Module-Name=\u30d5\u30a9\u30fc\u30e0\u30fb\u30a8\u30c7\u30a3\u30bf\u7528\u306eJ2EE\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/Bundle_ja.properties
index 3416acc..8ce4497 100755
--- a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 HINT_PersistenceUnitName=\u6301\u7d9a\u6027\u30e6\u30cb\u30c3\u30c8\u306e\u540d\u524d\u3002
 HINT_EntityManagerProperty=\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30de\u30cd\u30fc\u30b8\u30e3
diff --git a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/resources/Bundle_ja.properties
index f965e15..1b31727 100755
--- a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FormDesignerPalette/J2EEComponents=Java\u6301\u7d9a\u6027
 
diff --git a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/resources/MasterDetail_ja.html b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/resources/MasterDetail_ja.html
index ad261e1..251f77c 100755
--- a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/resources/MasterDetail_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/resources/MasterDetail_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/wizard/Bundle_ja.properties
index e316917..4739c20 100755
--- a/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-j2ee/form-j2ee/org/netbeans/modules/form/j2ee/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/GUIForms/MasterDetailForm.java=\u30de\u30b9\u30bf\u30fc/\u8a73\u7d30\u30b5\u30f3\u30d7\u30eb\u30fb\u30d5\u30a9\u30fc\u30e0
 
diff --git a/netbeans-l10n-zip/src/ja/java/form-kit/form-kit/org/netbeans/modules/form/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-kit/form-kit/org/netbeans/modules/form/kit/Bundle_ja.properties
index 5e08875..b4c8e59 100755
--- a/netbeans-l10n-zip/src/ja/java/form-kit/form-kit/org/netbeans/modules/form/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-kit/form-kit/org/netbeans/modules/form/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java SE
 OpenIDE-Module-Name=GUI\u30d3\u30eb\u30c0\u30fc
 OpenIDE-Module-Short-Description=Java\u30c7\u30b9\u30af\u30c8\u30c3\u30d7(AWT\u304a\u3088\u3073Swing)\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u8996\u899a\u7684\u306b\u30c7\u30b6\u30a4\u30f3\u53ef\u80fd\u306b\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/Bundle_ja.properties
index 617e74e..5131a73 100755
--- a/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_MODIFIED=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u4fdd\u5b58?
 OpenIDE-Module-Name=NetBeans\u30d5\u30a9\u30fc\u30e0\u30fb\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/actions/Bundle_ja.properties
index afdeccd..b7731d0 100755
--- a/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_InstallToPalette=\u30d1\u30ec\u30c3\u30c8\u306b\u8ffd\u52a0(&E)...
 
diff --git a/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/wizard/Bundle_ja.properties
index 0f97933..d1b9a4d 100755
--- a/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-nb/form-nb/org/netbeans/modules/nbform/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Template superclass wizard
 CTL_SuperclassTitle=\u30d5\u30a9\u30fc\u30e0\u306e\u30b9\u30fc\u30d1\u30fc\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/java/form-refactoring/form-refactoring/org/netbeans/modules/form/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form-refactoring/form-refactoring/org/netbeans/modules/form/refactoring/Bundle_ja.properties
index 6b84534..6853d5b 100755
--- a/netbeans-l10n-zip/src/ja/java/form-refactoring/form-refactoring/org/netbeans/modules/form/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form-refactoring/form-refactoring/org/netbeans/modules/form/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=GUI\u30d5\u30a9\u30fc\u30e0\u306e\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Short-Description=GUI\u30d5\u30a9\u30fc\u30e0\u306e\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/Bundle2_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/Bundle2_ja.properties
index 96c15a2..83e452c 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/Bundle2_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/Bundle2_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest localization
 OpenIDE-Module-Name=\u30d5\u30a9\u30fc\u30e0\u30fb\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/Bundle_ja.properties
index dfd5d1c..e74d1da 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # message shown when something wrong with guarded blocks
 MSG_ERR_GuardesBlocks=\u30d5\u30a9\u30fc\u30e0\u304c\u58ca\u308c\u3066\u3044\u308b\u3088\u3046\u3067\u3059\u3002GUI\u30d3\u30eb\u30c0\u30fc\u3067\u3001\n\u751f\u6210\u3055\u308c\u305f\u30b3\u30fc\u30c9\u304c\u3042\u308b\u30bb\u30af\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\n\u3053\u308c\u3089\u306e\u30bb\u30af\u30b7\u30e7\u30f3\u306e\u958b\u59cb\u3068\u7d42\u4e86\u3092\u793a\u3059\u7279\u5225\u306a\n\u30b3\u30e1\u30f3\u30c8\u304c\u524a\u9664\u307e\u305f\u306f\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\n\n\u30d5\u30a9\u30fc\u30e0\u306f\u8aad\u53d6\u308a\u5c02\u7528\u30e2\u30fc\u30c9\u3067\u958b\u304d\u307e\u3059\u3002\n\n\u8a73\u7d30\u306f\u3001http://wiki.netbeans.org/FormGuardedBlockError\n\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/actions/Bundle_ja.properties
index 004d720..d0e5291 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Form Actions
 ACT_Add=\u30d1\u30ec\u30c3\u30c8\u304b\u3089\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/assistant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/assistant/Bundle_ja.properties
index e774d63..e01df7e 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/assistant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/assistant/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TOOLTIP_HelpBar=\u30d8\u30eb\u30d7\u30fb\u30d0\u30fc\u306f\u3001GUI\u30c7\u30b6\u30a4\u30f3\u306e\u305f\u3081\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30fb\u30d2\u30f3\u30c8\u3092\u8868\u793a\u3057\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/beaninfo/awt/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/beaninfo/awt/Bundle_ja.properties
index 1422be6..2c862bb 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/beaninfo/awt/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/beaninfo/awt/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/beaninfo/swing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/beaninfo/swing/Bundle_ja.properties
index 595c7c3..edc012b 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/beaninfo/swing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/beaninfo/swing/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #BevelBorder
 PROP_BevelBorder.BevelType=\u30bf\u30a4\u30d7
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/editors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/editors/Bundle_ja.properties
index 01b5187..429d7b8 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/editors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/editors/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Sample ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/editors2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/editors2/Bundle_ja.properties
index f35606f..0bf22e8 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/editors2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/editors2/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Border editor
 CTL_BorderEditor_DisplayName=\u5883\u754c\u7dda\u30ab\u30b9\u30bf\u30de\u30a4\u30b6
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutdesign/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutdesign/Bundle_ja.properties
index 5bf3cea..3ff7ffc 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutdesign/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutdesign/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # names of various types (sizes) of default gaps
 DEFAULT_GAP_SMALL=\u30c7\u30d5\u30a9\u30eb\u30c8\u5c0f
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/Bundle_ja.properties
index 76882d8..bab9a7c 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/griddesigner/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/griddesigner/Bundle_ja.properties
index 6473e4d..13dda17 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/griddesigner/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/griddesigner/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GridDesigner.layoutConstraints=\u30ec\u30a4\u30a2\u30a6\u30c8\u5236\u7d04
 GridDesigner.gapSupportEnable=\u5747\u4e00\u306e\u30ae\u30e3\u30c3\u30d7\u3092\u6709\u52b9\u306b\u3059\u308b
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/griddesigner/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/griddesigner/actions/Bundle_ja.properties
index ed6867f..fa99796 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/griddesigner/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/layoutsupport/griddesigner/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AddAction_Name=\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u8ffd\u52a0
 AddGapsAction_Name=\u5217\u3068\u884c\u9593\u306e\u30ae\u30e3\u30c3\u30d7\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/menu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/menu/Bundle_ja.properties
index 3426dfe..2a6dbae 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/menu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/menu/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_InsertMenu=\u30e1\u30cb\u30e5\u30fc\u306e\u8ffd\u52a0
 ACT_AddFromPalette=\u30d1\u30ec\u30c3\u30c8\u304b\u3089\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/palette/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/palette/Bundle_ja.properties
index 400d7a2..2ef9732 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/palette/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/palette/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Display name of the Palette Item Loader
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/project/Bundle_ja.properties
index cbea3ca..49d52bb 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # component class source descriptions
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/AWTForms_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/AWTForms_ja.html
index 89b0a7a..891a816 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/AWTForms_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/AWTForms_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Application_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Application_ja.html
index c4f9e39..d72c9c0 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Application_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Application_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/BeanForm_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/BeanForm_ja.html
index 5b66e82..a13cdd0 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/BeanForm_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/BeanForm_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2001, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Bundle_ja.properties
index 4845696..007de4d 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Filenames
 Services/MIMEResolver/SwingPaletteItemResolver.xml=Swing/AWT\u30d1\u30ec\u30c3\u30c8\u306e\u9805\u76ee
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Dialog_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Dialog_ja.html
index bdbb47b..f41d4c0 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Dialog_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Dialog_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Dialogs_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Dialogs_ja.html
index e305b15..66d701b 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Dialogs_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Dialogs_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/FormApplet_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/FormApplet_ja.html
index 9391752..ded515b 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/FormApplet_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/FormApplet_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/FormJApplet_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/FormJApplet_ja.html
index ed803c7..7166e53 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/FormJApplet_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/FormJApplet_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Forms_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Forms_ja.html
index c7d906c..28b0817 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Forms_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Forms_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Frame_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Frame_ja.html
index 6fa12a0..56109b1 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Frame_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Frame_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JDialog_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JDialog_ja.html
index 04a7a89..64ea212 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JDialog_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JDialog_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JFrame_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JFrame_ja.html
index 74cc432..0042f97 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JFrame_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JFrame_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JInternalFrame_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JInternalFrame_ja.html
index fd96b25..725d1f5 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JInternalFrame_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JInternalFrame_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JPanel_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JPanel_ja.html
index 56e51d1..21eb292 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JPanel_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/JPanel_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/MDIApplication_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/MDIApplication_ja.html
index e1836fd..41a8d1f 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/MDIApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/MDIApplication_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/OKCancelDialog_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/OKCancelDialog_ja.html
index 853a3b3..55e2479 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/OKCancelDialog_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/OKCancelDialog_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Panel_ja.html b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Panel_ja.html
index 18b7631..4063d6b 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Panel_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/resources/Panel_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 1999, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/wizard/Bundle_ja.properties
index b703ab9..51e7edf 100755
--- a/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/form/form/org/netbeans/modules/form/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/catalog/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/catalog/Bundle_ja.properties
index e676219..ff7b885 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/catalog/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/catalog/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_HibernateCatalog=Hibernate\u30ab\u30bf\u30ed\u30b0
 LBL_HibernateCatalogDescription=Hibernate XML DTD\u306e\u30ab\u30bf\u30ed\u30b0
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/cfg/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/cfg/Bundle_ja.properties
index dbe96d5..6c66cd4 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/cfg/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/cfg/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #HibernateCfgProperties
 LBL_CustomClass=--\u30ab\u30b9\u30bf\u30e0\u30fb\u30af\u30e9\u30b9\u3092\u5165\u529b--
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/completion/Bundle_ja.properties
index b790e63..aa7ada4 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/completion/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Generator classes
 INCREMENT_GENERATOR_DESC=\u307b\u304b\u306e\u30d7\u30ed\u30bb\u30b9\u304c\u540c\u3058\u8868\u306b\u30c7\u30fc\u30bf\u3092\u633f\u5165\u3057\u3066\u3044\u306a\u3044\u5834\u5408\u306b\u306e\u307f\u4e00\u610f\u3067\u3042\u308b<code>long</code>\u3001<code>short</code>\u3001\u307e\u305f\u306f<code>int</code>\u306e\u3044\u305a\u308c\u304b\u306e\u578b\u306e\u8b58\u5225\u5b50\u3092\u751f\u6210\u3057\u307e\u3059\u3002\u30af\u30e9\u30b9\u30bf\u3067\u306f\u4f7f\u7528\u3057\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/editor/Bundle_ja.properties
index 567b209..8d255e4 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/editor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SourceNotFound=\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/hqleditor/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/hqleditor/ui/Bundle_ja.properties
index c34f83e..410a4ce 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/hqleditor/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/hqleditor/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
-
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_HQLEditorAction=HQL\u554f\u5408\u305b\u306e\u5b9f\u884c
 CTL_HQLEditorTopComponent=HQL\u554f\u5408\u305b
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/hyperlink/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/hyperlink/Bundle_ja.properties
index dda6b98..d727d91 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/hyperlink/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/hyperlink/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ResourceNotFound=Hibernate\u306e\u30de\u30c3\u30d4\u30f3\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/Bundle_ja.properties
index 1023d18..d184c12 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9
 LBL_HibernateCfg_loader_name=Hibernate\u69cb\u6210\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/multiview/Bundle_ja.properties
index 2b9420b..f77b64d 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/cfg/multiview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Design=\u30c7\u30b6\u30a4\u30f3
 LBL_Role=\u30ed\u30fc\u30eb\u540d
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/mapping/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/mapping/Bundle_ja.properties
index 57a436a..9982573 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/mapping/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/mapping/Bundle_ja.properties
@@ -1,45 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9
-# 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.
 LBL_HibernateMapping_loader_name=Hibernate\u306e\u30de\u30c3\u30d4\u30f3\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb
 
 LBL_Design=\u30c7\u30b6\u30a4\u30f3
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/reveng/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/reveng/Bundle_ja.properties
index bd4811c..a2385fc 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/reveng/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/loaders/reveng/Bundle_ja.properties
@@ -1,40 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 LBL_HibernateReveng_loader_name=HibernateReveng\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/refactoring/Bundle_ja.properties
index 182c633..8a35fe1 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/refactoring/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 FOUND={0}\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f
 CHANGE={0}\u3092{1}\u306b\u5909\u66f4
 
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/Bundle_ja.properties
index 93c9d7e..113debe 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java SE
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001NetBeans\u3067Hibernate\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059
 OpenIDE-Module-Name=Hibernate
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateCodeGenFile_ja.html b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateCodeGenFile_ja.html
index 71a9785..8f2084b 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateCodeGenFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateCodeGenFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateConfigurationFile_ja.html b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateConfigurationFile_ja.html
index 6c35d9e..a12db1f 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateConfigurationFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateConfigurationFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateMappingFile_ja.html b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateMappingFile_ja.html
index ad97400..2891f9b 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateMappingFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateMappingFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateRevengFile_ja.html b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateRevengFile_ja.html
index bac3e58..91f4017 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateRevengFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateRevengFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateUtilFile_ja.html b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateUtilFile_ja.html
index 50f9342..68573c1 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateUtilFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/resources/HibernateUtilFile_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle_ja.properties
index e13d55a..8e35580 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Common Errors
 Unsupported_Project_Message=<html>\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30bf\u30a4\u30d7\u3067\u3059\u3002</html>
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/support/Bundle_ja.properties
index 4b5aed0..4d3a99d 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate/hibernate/org/netbeans/modules/hibernate/wizards/support/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # DBSchemaFileList
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/Bundle_ja.properties
index e4fa2bc..0c8d564 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=Hibernate 4.3.x\u3092\u30b5\u30dd\u30fc\u30c8\u3059\u308b\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Name=Hibernate 4.3.x\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/resources/Bundle_ja.properties
index e013bdf..1860671 100755
--- a/netbeans-l10n-zip/src/ja/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hibernate4lib/hibernate4lib/org/netbeans/modules/hibernate4lib/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 jpa2-persistence=Persistence JPA2.1
diff --git a/netbeans-l10n-zip/src/ja/java/hudson-ant/hudson-ant/org/netbeans/modules/hudson/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hudson-ant/hudson-ant/org/netbeans/modules/hudson/ant/Bundle_ja.properties
index 4705741..430cd31 100755
--- a/netbeans-l10n-zip/src/ja/java/hudson-ant/hudson-ant/org/netbeans/modules/hudson/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hudson-ant/hudson-ant/org/netbeans/modules/hudson/ant/Bundle_ja.properties
@@ -1,44 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - name of Ant target which be run if selected
 JobCreator.checkbox.a11y=Ant\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u5b9f\u884c: {0}
 JobCreator.copy_label=\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u30b3\u30d4\u30fc(&C)
 JobCreator.copy_message=\u30b0\u30ed\u30fc\u30d0\u30eb\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u306f\u5c02\u7528\u306e\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30d5\u30a9\u30eb\u30c0\u306b\u30b3\u30d4\u30fc\u3055\u308c\u308b\u3079\u304d\u3067\u3059\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Hudson Ant\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8
 ProjectTypes.buildJar.text=Jar\u3092\u30d3\u30eb\u30c9
 ProjectTypes.buildDist.text=\u30b3\u30fc\u30c9\u3092\u30d3\u30eb\u30c9
diff --git a/netbeans-l10n-zip/src/ja/java/hudson-maven/hudson-maven/org/netbeans/modules/hudson/maven/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/hudson-maven/hudson-maven/org/netbeans/modules/hudson/maven/Bundle_ja.properties
index 268463d..2c48103 100755
--- a/netbeans-l10n-zip/src/ja/java/hudson-maven/hudson-maven/org/netbeans/modules/hudson/maven/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/hudson-maven/hudson-maven/org/netbeans/modules/hudson/maven/Bundle_ja.properties
@@ -1,46 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 HpiPluginWarning_problem_description=Hudson/Jenkins\u30d7\u30e9\u30b0\u30a4\u30f3\u958b\u767a\u30b5\u30dd\u30fc\u30c8\u306f\u3001NetBeans 7.3\u304b\u3089\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002https://github.com/stapler/netbeans-stapler-plugin\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u304f\u3060\u3055\u3044(\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30dd\u30fc\u30bf\u30eb\u3067\u5165\u624b\u53ef\u80fd)\u3002
 HpiPluginWarning_problem_displayName=Hudson/Jenkins\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30b5\u30dd\u30fc\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 HpiPluginWarning_unresolved=\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30dd\u30fc\u30bf\u30eb\u304b\u3089\u306e\u81ea\u52d5\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u304c\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002Jenkins\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30b5\u30dd\u30fc\u30c8\u304a\u3088\u3073Stapler\u30b5\u30dd\u30fc\u30c8\u30fb\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-# 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-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.
 OpenIDE-Module-Name=Maven Hudson
 
diff --git a/netbeans-l10n-zip/src/ja/java/i18n-form/i18n-form/org/netbeans/modules/i18n/form/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/i18n-form/i18n-form/org/netbeans/modules/i18n/form/Bundle_ja.properties
index 4b1acc3..ec75cce 100755
--- a/netbeans-l10n-zip/src/ja/java/i18n-form/i18n-form/org/netbeans/modules/i18n/form/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/i18n-form/i18n-form/org/netbeans/modules/i18n/form/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest-form.mf
diff --git a/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/Bundle_ja.properties
index f45c89c..04a4f3d 100755
--- a/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## HelpStringCustomEditor.java (and inner classes)
diff --git a/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/java/Bundle_ja.properties
index a000edc..f0c993e 100755
--- a/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/java/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## JavaReplacePanel.java
diff --git a/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/wizard/Bundle_ja.properties
index e852668..3e42075 100755
--- a/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/i18n/i18n/org/netbeans/modules/i18n/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # wizard iterator
 TXT_IteratorName={0}/{1}\u30da\u30fc\u30b8
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-core-utilities/j2ee-core-utilities/org/netbeans/modules/j2ee/core/support/java/method/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-core-utilities/j2ee-core-utilities/org/netbeans/modules/j2ee/core/support/java/method/Bundle_ja.properties
index ab52457..ff456b6 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-core-utilities/j2ee-core-utilities/org/netbeans/modules/j2ee/core/support/java/method/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-core-utilities/j2ee-core-utilities/org/netbeans/modules/j2ee/core/support/java/method/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MethodCustomizerPanel.exceptionsPanel.TabConstraints.tabTitle=\u4f8b\u5916
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-core-utilities/j2ee-core-utilities/org/netbeans/modules/j2ee/core/utilities/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-core-utilities/j2ee-core-utilities/org/netbeans/modules/j2ee/core/utilities/Bundle_ja.properties
index 847b7c3..bfa778f 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-core-utilities/j2ee-core-utilities/org/netbeans/modules/j2ee/core/utilities/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-core-utilities/j2ee-core-utilities/org/netbeans/modules/j2ee/core/utilities/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java EE\u30b3\u30a2\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-eclipselink/j2ee-eclipselink/org/netbeans/modules/j2ee/eclipselink/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-eclipselink/j2ee-eclipselink/org/netbeans/modules/j2ee/eclipselink/Bundle_ja.properties
index ec25a13..82cea2b 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-eclipselink/j2ee-eclipselink/org/netbeans/modules/j2ee/eclipselink/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-eclipselink/j2ee-eclipselink/org/netbeans/modules/j2ee/eclipselink/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=EclipseLink (JPA 2.1)
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-eclipselinkmodelgen/j2ee-eclipselinkmodelgen/org/netbeans/modules/j2ee/eclipselinkmodelgen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-eclipselinkmodelgen/j2ee-eclipselinkmodelgen/org/netbeans/modules/j2ee/eclipselinkmodelgen/Bundle_ja.properties
index 38b5e48..d9bbb0e 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-eclipselinkmodelgen/j2ee-eclipselinkmodelgen/org/netbeans/modules/j2ee/eclipselinkmodelgen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-eclipselinkmodelgen/j2ee-eclipselinkmodelgen/org/netbeans/modules/j2ee/eclipselinkmodelgen/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/Bundle_ja.properties
index c6c58fc..1a0ef09 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JPA\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
 
 TXT_PersistenceXmlInvalidProblem=\u5909\u66f4\u70b9\u306e{0}\u3078\u306e\u53cd\u6620\u306f\u3001{0}\u304c\u7121\u52b9\u306a\u305f\u3081\u884c\u3048\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/moveclass/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/moveclass/Bundle_ja.properties
index 30936fb..38f728d 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/moveclass/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/moveclass/Bundle_ja.properties
@@ -1,43 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_PersistenceXmlRename=\u7ba1\u7406\u5bfe\u8c61\u30af\u30e9\u30b9\u53c2\u7167<b>{1}</b>\u3092<b>{2}</b>\u306b\u5909\u66f4
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/rename/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/rename/Bundle_ja.properties
index e9e8838..bc2a9fa 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/rename/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/rename/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_PersistenceXmlRename=\u7ba1\u7406\u5bfe\u8c61\u30af\u30e9\u30b9\u53c2\u7167<b>{1}</b>\u3092<b>{2}</b>\u306b\u5909\u66f4
 TXT_PersistenceXmlInvalidProblem=\u5909\u66f4\u70b9\u306e{0}\u3078\u306e\u53cd\u6620\u306f\u3001{0}\u304c\u7121\u52b9\u306a\u305f\u3081\u884c\u3048\u307e\u305b\u3093\u3002
 TXT_EntityAnnotationRename=\u6ce8\u91c8\u306e\u5024<b>{1}</b>\u3092<b>{2}</b>\u306b\u5909\u66f4
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/safedelete/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/safedelete/Bundle_ja.properties
index 649307e..58df7a5 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/safedelete/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/safedelete/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_PersistenceXmlSafeDeleteClass=\u7ba1\u7406\u5bfe\u8c61\u30af\u30e9\u30b9\u53c2\u7167{0}\u3092\u5b89\u5168\u306b\u524a\u9664
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/whereused/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/whereused/Bundle_ja.properties
index 5ff5497..0226d7b 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/whereused/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-refactoring/j2ee-jpa-refactoring/org/netbeans/modules/j2ee/jpa/refactoring/whereused/Bundle_ja.properties
@@ -1,43 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_PersistenceXmlClassWhereUsed=&lt;class&gt;<b>{0}</b>&lt;/class&gt;
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/Bundle_ja.properties
index cd5152e..aac785e 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001Java Persistence API\u306e\u5206\u91ce\u3067\u306e\u30c1\u30a7\u30c3\u30af\u3068\u95a2\u9023\u3059\u308b\u30d2\u30f3\u30c8(quick-fix\u30a2\u30af\u30b7\u30e7\u30f3)\u306b\u57fa\u3065\u3044\u305f\u3001\u591a\u6570\u306e\u9759\u7684\u30b3\u30fc\u30c9\u5206\u6790\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/fixes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/fixes/Bundle_ja.properties
index 20047bb..651ac6d 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/fixes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/fixes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CreatePersistenceUnitHint=\u6301\u7d9a\u6027\u30e6\u30cb\u30c3\u30c8\u3092\u4f5c\u6210...
 LBL_ImplementSerializable=java.io.Serializable\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3092\u5b9f\u88c5
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/resources/Bundle_ja.properties
index 868fa42..5e00909 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Hints categories and subcategories
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/attribute/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/attribute/Bundle_ja.properties
index c752288..e5ad75e 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/attribute/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/attribute/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/entity/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/entity/Bundle_ja.properties
index 4bb6287..b7d58a1 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/entity/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-jpa-verification/j2ee-jpa-verification/org/netbeans/modules/j2ee/jpa/verification/rules/entity/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-metadata-model-support/j2ee-metadata-model-support/org/netbeans/modules/j2ee/metadata/model/support/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-metadata-model-support/j2ee-metadata-model-support/org/netbeans/modules/j2ee/metadata/model/support/resources/Bundle_ja.properties
index 2874bf1..411e850 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-metadata-model-support/j2ee-metadata-model-support/org/netbeans/modules/j2ee/metadata/model/support/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-metadata-model-support/j2ee-metadata-model-support/org/netbeans/modules/j2ee/metadata/model/support/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Name=Java EE\u30e1\u30bf\u30c7\u30fc\u30bf\u30fb\u30e2\u30c7\u30eb\u306e\u30b5\u30dd\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-metadata/j2ee-metadata/org/netbeans/modules/j2ee/metadata/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-metadata/j2ee-metadata/org/netbeans/modules/j2ee/metadata/Bundle_ja.properties
index fbf4367..2d2e9cf 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-metadata/j2ee-metadata/org/netbeans/modules/j2ee/metadata/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-metadata/j2ee-metadata/org/netbeans/modules/j2ee/metadata/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Long-Description=\u6ce8\u91c8\u307e\u305f\u306fXML\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf(\u69cb\u6210\u30d5\u30a1\u30a4\u30eb)(\u307e\u305f\u306f\u305d\u306e\u4e21\u65b9)\u3092\u4f7f\u7528\u3057\u3066Java\u30af\u30e9\u30b9\u3067\u5b9a\u7fa9\u3055\u308c\u305f\u3001Java EE\u30e1\u30bf\u30c7\u30fc\u30bf\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u305f\u3081\u306e\u30e1\u30bd\u30c3\u30c9
 OpenIDE-Module-Name=Java EE\u30e1\u30bf\u30c7\u30fc\u30bf
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence-kit/j2ee-persistence-kit/org/netbeans/modules/j2ee/persistence/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence-kit/j2ee-persistence-kit/org/netbeans/modules/j2ee/persistence/kit/Bundle_ja.properties
index a9afb23..5090634 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence-kit/j2ee-persistence-kit/org/netbeans/modules/j2ee/persistence/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence-kit/j2ee-persistence-kit/org/netbeans/modules/j2ee/persistence/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java SE
 OpenIDE-Module-Name=Java\u6301\u7d9a\u6027
 OpenIDE-Module-Short-Description=Java Persistence API\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/action/Bundle_ja.properties
index 47e62af..8616830 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/action/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_UseEntityManagerAction=\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30de\u30cd\u30fc\u30b8\u30e3\u306e\u4f7f\u7528...
 
 LBL_VariableName=\u5909\u6570\u540d:
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/dd/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/dd/common/Bundle_ja.properties
index 0815804..4b96dfa 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/dd/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/dd/common/Bundle_ja.properties
@@ -1,46 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 Forte for Java, Community Edition. The Initial
-# Developer of the Original Software is Sun Microsystems, Inc. Portions
-# Copyright 1997-2009 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #ParseUtils
 MSG_cannotParse=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093:
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/Bundle_ja.properties
index 567b209..8d255e4 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SourceNotFound=\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle_ja.properties
index c86e634..d9dce9b 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 scanning-in-progress=\u30b9\u30ad\u30e3\u30f3\u4e2d...
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/hyperlink/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/hyperlink/Bundle_ja.properties
index 68f79cf..4de73cd 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/hyperlink/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/editor/hyperlink/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_GoToNamedQuery = \u540d\u524d\u306b\u3088\u3063\u3066\u540d\u524d\u4ed8\u304d\u554f\u5408\u305b\u306b\u79fb\u52d5
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/jpqleditor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/jpqleditor/Bundle_ja.properties
index 6f6340e..78e703d 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/jpqleditor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/jpqleditor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/Bundle_ja.properties
index 1d45f8f..bf01cec 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/provider/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/provider/Bundle_ja.properties
index 6ab5653..51bf0b3 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/provider/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/provider/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_DEFAULT_PROVIDER=<\u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0>
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/Bundle_ja.properties
index ab21ac4..459d594 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/spi/entitymanagergenerator/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_ClassOnly=\u751f\u6210\u306f\u3001\u30af\u30e9\u30b9\u3060\u3051\u306b\u53ef\u80fd\u3067\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/Bundle_ja.properties
index c55bd6e..8f06fd9 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=JSR220\u3067\u5b9a\u7fa9\u3055\u308c\u305fJava Persistence\u30c6\u30af\u30ce\u30ed\u30b8\u306b\u5bfe\u3059\u308b\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Name=Java Persistence API\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/DBScript_ja.html b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/DBScript_ja.html
index f5bf8e1..83a6006 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/DBScript_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/DBScript_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityDatabase_ja.html b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityDatabase_ja.html
index d6613a0..5bd66f8 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityDatabase_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityDatabase_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityEJB_ja.html b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityEJB_ja.html
index 8a50c7b..5b992dd 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityEJB_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/EntityEJB_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/JpaController_ja.html b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/JpaController_ja.html
index fb947d3..676b93f 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/JpaController_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/JpaController_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/PersistenceUnit_ja.html b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/PersistenceUnit_ja.html
index cd66b9d..04e7e3c 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/PersistenceUnit_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/ui/resources/PersistenceUnit_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/unit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/unit/Bundle_ja.properties
index c72b043..1fdb4c3 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/unit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/unit/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2006, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=BookMultiView
 
 LBL_loaderName=\u6301\u7d9a\u6027
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/util/Bundle_ja.properties
index 2b5ccf8..e9eabec 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_DEFAULT_PROVIDER= (\u30c7\u30d5\u30a9\u30eb\u30c8)
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/Bundle_ja.properties
index 7b79fdd..021f96a 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 MSG_NoEntityClassesSelected=\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30af\u30e9\u30b9\u3092\u9078\u629e\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/dbscript/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/dbscript/Bundle_ja.properties
index 8a9c772..e37ee87 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/dbscript/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/dbscript/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 Templates/Persistence/DBScriptFromEntities=\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30af\u30e9\u30b9\u306eDB\u30b9\u30af\u30ea\u30d7\u30c8
 
 LBL_WizardTitle_FromEntity=\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30af\u30e9\u30b9\u306eDB\u30b9\u30af\u30ea\u30d7\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/entity/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/entity/Bundle_ja.properties
index f0a4d27..314130b 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/entity/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/entity/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_PersistenceType=\u6301\u7d9a\u6027\u30bf\u30a4\u30d7:
 LBL_Container=\u30b3\u30f3\u30c6\u30ca
 LBL_Bean=Bean
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/fromdb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/fromdb/Bundle_ja.properties
index 1c06659..360fc1c 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/fromdb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/fromdb/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Persistence/RelatedCMP=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304b\u3089\u306e\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30af\u30e9\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/Bundle_ja.properties
index bedca65..b628e7f 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 Templates/Persistence/JpaControllersFromEntities=\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fb\u30af\u30e9\u30b9\u306eJPA\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fb\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/library/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/library/Bundle_ja.properties
index 2813230..ff8fc28 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/library/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/library/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_EmptyName=\u540d\u524d\u3092\u7a7a\u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
 ERR_LibraryExists=\u30e9\u30a4\u30d6\u30e9\u30ea\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/unit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/unit/Bundle_ja.properties
index 1c797b9..f3e1592 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/unit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistence/j2ee-persistence/org/netbeans/modules/j2ee/persistence/wizard/unit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Persistence/PersistenceUnit=\u6301\u7d9a\u6027\u30e6\u30cb\u30c3\u30c8
 LBL_WizardTitle=\u6301\u7d9a\u6027\u30e6\u30cb\u30c3\u30c8\u30fb\u30a6\u30a3\u30b6\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/java/j2ee-persistenceapi/j2ee-persistenceapi/org/netbeans/modules/j2ee/persistenceapi/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/j2ee-persistenceapi/j2ee-persistenceapi/org/netbeans/modules/j2ee/persistenceapi/resources/Bundle_ja.properties
index 8a93ff1..27301be 100755
--- a/netbeans-l10n-zip/src/ja/java/j2ee-persistenceapi/j2ee-persistenceapi/org/netbeans/modules/j2ee/persistenceapi/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/j2ee-persistenceapi/j2ee-persistenceapi/org/netbeans/modules/j2ee/persistenceapi/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java Persistence API\u30b5\u30dd\u30fc\u30c8API
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Short-Description=Java Persistence API\u3092\u30b5\u30dd\u30fc\u30c8\u3059\u308bAPI
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/Bundle_ja.properties
index 73d0d75..9ad236e 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NAME_src.dir=\u30bd\u30fc\u30b9\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8
 NAME_test.src.dir=\u30c6\u30b9\u30c8\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/applet/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/applet/Bundle_ja.properties
index 09969a6..a0749aa 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/applet/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/applet/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #generated HTML
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/impl/Bundle_ja.properties
index d14fe36..d67dde6 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/impl/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_ExportPackageAction=\u30d1\u30c3\u30b1\u30fc\u30b8\u3092\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
 CTL_UnexportPackageAction=\u30d1\u30c3\u30b1\u30fc\u30b8\u3092\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u3057\u306a\u3044
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/Bundle_ja.properties
index 134f3ff..995e11c 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ACTION_build=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d3\u30eb\u30c9
 ACTION_clean=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u6d88\u53bb
 ACTION_compile.single=\u30d5\u30a1\u30a4\u30eb\u306e\u30b3\u30f3\u30d1\u30a4\u30eb
@@ -27,45 +44,6 @@
 # {0} - file name
 CTL_FileMultipleMain=\u30d5\u30a1\u30a4\u30eb{0}\u306b\u3088\u308a\u591a\u304f\u306e\u30e1\u30a4\u30f3\u30fb\u30af\u30e9\u30b9\u304c\u3042\u308a\u307e\u3059\u3002
 CTL_MainClassWarning_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5b9f\u884c
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2013 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
 ERR_RegenerateProjectFiles=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u518d\u751f\u6210\u3067\u304d\u307e\u305b\u3093\u3002
 ERR_ProjectReadOnly=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0{0}\u306f\u8aad\u53d6\u308a\u5c02\u7528\u3067\u3059\u3002
 # {0} - project name
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/Bundle_ja.properties
index 118cbea..95350f6 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_EditPlatform=\u7de8\u96c6...
 #LibrariesNode
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/customizer/Bundle_ja.properties
index 1406a64..8bfc6e1 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Ant artifact Chooser
 LBL_AACH_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/Bundle_ja.properties
index 912eb0d..e1daff1 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 VMOptionEditorPanel.cancelButton.text=\u53d6\u6d88
 VMOptionEditorPanel.okButton.text=OK
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/wizards/Bundle_ja.properties
index 81adf5c..265b087 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/project/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #FolderList
 CTL_AddFolder=\u30d5\u30a9\u30eb\u30c0\u306e\u8ffd\u52a0...
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/queries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/queries/Bundle_ja.properties
index 463b168..40352de 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/queries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/queries/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LibrarySourceGroup_DisplayName=\u5171\u6709\u30e9\u30a4\u30d6\u30e9\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/resources/Bundle_ja.properties
index 543bf38..5401705 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=\u3059\u3079\u3066\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30bf\u30a4\u30d7(J2SEProject\u304a\u3088\u3073WebProject\u3001EjbJarProject\u3001AppClientProject\u306a\u3069\u306eJava EE\u30d7\u30ed\u30b8\u30a7\u30af\u30c8)\u306b\u5171\u901a\u3059\u308b\u305d\u306e\u4ed6\u306eAPI\u5b9f\u88c5\u3002FileEncodingQuery\u3001SourceLevelQuery\u306a\u3069\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u5b9f\u88c5\u3092\u63d0\u4f9b\u3002
 OpenIDE-Module-Name=Java\u5171\u901a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8API
diff --git a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/ui/Bundle_ja.properties
index fc6ac64..1cccad2 100755
--- a/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-api-common/java-api-common/org/netbeans/modules/java/api/common/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2007 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # PlatformUiSupport
 # {0} - JDK version
diff --git a/netbeans-l10n-zip/src/ja/java/java-completion/java-completion/org/netbeans/modules/java/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-completion/java-completion/org/netbeans/modules/java/completion/Bundle_ja.properties
index fe26e90..71b07f7 100755
--- a/netbeans-l10n-zip/src/ja/java/java-completion/java-completion/org/netbeans/modules/java/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-completion/java-completion/org/netbeans/modules/java/completion/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=Java\u306e\u30b3\u30fc\u30c9\u88dc\u5b8c\u30d7\u30ed\u30d0\u30a4\u30c0
 OpenIDE-Module-Name=Java\u30b3\u30fc\u30c9\u88dc\u5b8c
diff --git a/netbeans-l10n-zip/src/ja/java/java-debug/java-debug/org/netbeans/modules/java/debug/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-debug/java-debug/org/netbeans/modules/java/debug/Bundle_ja.properties
index b0a1182..4748981 100755
--- a/netbeans-l10n-zip/src/ja/java/java-debug/java-debug/org/netbeans/modules/java/debug/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-debug/java-debug/org/netbeans/modules/java/debug/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NM_Comment=\u30b3\u30e1\u30f3\u30c8
 Cannot_Resolve_Element=<\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093>
diff --git a/netbeans-l10n-zip/src/ja/java/java-debug/java-debug/org/netbeans/modules/java/debug/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-debug/java-debug/org/netbeans/modules/java/debug/resources/Bundle_ja.properties
index 78d3b08..ab17a61 100755
--- a/netbeans-l10n-zip/src/ja/java/java-debug/java-debug/org/netbeans/modules/java/debug/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-debug/java-debug/org/netbeans/modules/java/debug/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java\u30bd\u30fc\u30b9\u306e\u30c7\u30d0\u30c3\u30b0
 OpenIDE-Module-Short-Description=Java AST\u7528\u306e\u30ca\u30d3\u30b2\u30fc\u30bf
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor-base/java-editor-base/org/netbeans/modules/java/editor/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor-base/java-editor-base/org/netbeans/modules/java/editor/base/Bundle_ja.properties
index 2e72496..0838dfe 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor-base/java-editor-base/org/netbeans/modules/java/editor/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor-base/java-editor-base/org/netbeans/modules/java/editor/base/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=Java\u30a8\u30c7\u30a3\u30bf\u30fb\u30d9\u30fc\u30b9\u306b\u306f\u3001java\u30d5\u30a1\u30a4\u30eb\u3092\u7de8\u96c6\u3059\u308b\u305f\u3081\u306e\u30b5\u30dd\u30fc\u30c8\u304a\u3088\u3073\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
 OpenIDE-Module-Name=Java\u30a8\u30c7\u30a3\u30bf\u30fb\u30d9\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor-lib/java-editor-lib/org/netbeans/editor/ext/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor-lib/java-editor-lib/org/netbeans/editor/ext/java/Bundle_ja.properties
index bde7e62..69fa835 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor-lib/java-editor-lib/org/netbeans/editor/ext/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor-lib/java-editor-lib/org/netbeans/editor/ext/java/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Editor ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor-lib/java-editor-lib/org/netbeans/lib/java/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor-lib/java-editor-lib/org/netbeans/lib/java/editor/Bundle_ja.properties
index 09c52c6..8a2d591 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor-lib/java-editor-lib/org/netbeans/lib/java/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor-lib/java-editor-lib/org/netbeans/lib/java/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java\u30a8\u30c7\u30a3\u30bf\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/editor/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/editor/java/Bundle_ja.properties
index 440f680..04052fb 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/editor/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/editor/java/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - file system display name
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/Bundle_ja.properties
index 585cbcd..a5fd27e 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java\u30a8\u30c7\u30a3\u30bf
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/codegen/Bundle_ja.properties
index 5ddc4d6..6c7d729 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/codegen/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 complete-line-newline=\u884c\u3092\u5b8c\u4e86\u3057\u3066\u65b0\u3057\u3044\u884c\u3092\u4f5c\u6210
 complete-line=\u884c\u3092\u5b8c\u4e86
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/codegen/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/codegen/ui/Bundle_ja.properties
index 04a6c39..40d77b9 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/codegen/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/codegen/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BTN_SelectAll=\u3059\u3079\u3066\u3092\u9078\u629e(&A)
 BTN_SelectNone=\u4f55\u3082\u9078\u629e\u3057\u306a\u3044(&N)
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/fold/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/fold/Bundle_ja.properties
index 97367e5..efe2729 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/fold/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/fold/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Fold_BundleString=\u30ea\u30bd\u30fc\u30b9\u30fb\u30d0\u30f3\u30c9\u30eb\u304b\u3089\u306e\u6587\u5b57\u5217
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/imports/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/imports/Bundle_ja.properties
index bf70f99..c6299b6 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/imports/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/imports/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Messages for JavaFixAllImports
 #FixingImports_Lbl=Fixing imports...
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/javadoc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/javadoc/Bundle_ja.properties
index 5ad5355..6d2e42b 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/javadoc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/javadoc/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2007 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 scanning-in-progress=\u30b9\u30ad\u30e3\u30f3\u4e2d...
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/options/Bundle_ja.properties
index 13ebe28..aef7e9f 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OPTIONS_java=Java\u30a8\u30c7\u30a3\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/overridden/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/overridden/Bundle_ja.properties
index e3b9503..54b6c46 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/overridden/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/overridden/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CAP_Implements=\u5b9f\u88c5\u3057\u3066\u3044\u308b
 CAP_Overrides=\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3057\u3066\u3044\u308b
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/rename/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/rename/Bundle_ja.properties
index 956fb05..b6559be 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/rename/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/rename/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 in-place-refactoring=\u540d\u524d\u306e\u5373\u6642\u5909\u66f4
 WARN_CannotPerformHere=\u3053\u3053\u3067\u306f\u540d\u524d\u306e\u5373\u6642\u5909\u66f4\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/resources/Bundle_ja.properties
index 52fc1e4..2023548 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 text/x-java=Java
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/semantic/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/semantic/Bundle_ja.properties
index 8265242..8362462 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/semantic/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/semantic/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FIX_Remove_Unused_Import=\u672a\u4f7f\u7528\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u3092\u524a\u9664
 FIX_All_Remove_Unused_Import=\u672a\u4f7f\u7528\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u3092\u3059\u3079\u3066\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/whitelist/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/whitelist/Bundle_ja.properties
index 0a537a8..225fac1 100755
--- a/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/whitelist/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-editor/java-editor/org/netbeans/modules/java/editor/whitelist/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_ProviderDescription=\u30db\u30ef\u30a4\u30c8\u30fb\u30ea\u30b9\u30c8\u30fb\u30eb\u30fc\u30eb\u306e\u9055\u53cd\u3092\u4e00\u89a7\u8868\u793a\u3057\u307e\u3059
 LBL_ProviderName=\u30db\u30ef\u30a4\u30c8\u30fb\u30ea\u30b9\u30c8\u9055\u53cd
 MSG_Violations=\u8907\u6570\u306e\u30eb\u30fc\u30eb\u306b\u9055\u53cd\u3057\u3066\u3044\u307e\u3059:
diff --git a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/Bundle_ja.properties
index fb0baba..14a068f 100755
--- a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 ## manifest.mf
diff --git a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/ClientEditor_ja.html b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/ClientEditor_ja.html
index 9b8c1d3..251121b 100755
--- a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/ClientEditor_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/ClientEditor_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/GUIFormExamples_ja.html b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/GUIFormExamples_ja.html
index 5189ae3..5e40470 100755
--- a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/GUIFormExamples_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/GUIFormExamples_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/anagrams_ja.html b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/anagrams_ja.html
index 59a4228..6bf11b4 100755
--- a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/anagrams_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/anagrams_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.1 Transitional//EN">
 <html><head>
diff --git a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/j2seSamplesCategory_ja.html b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/j2seSamplesCategory_ja.html
index 481b940..41e7262 100755
--- a/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/j2seSamplesCategory_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-examples/java-examples/org/netbeans/modules/java/examples/resources/descriptions/j2seSamplesCategory_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/Bundle_ja.properties
index 8fe05cf..e365cd2 100755
--- a/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u81ea\u7531\u5f62\u5f0f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306eJava\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/Bundle_ja.properties
index 1f8869f..8f15624 100755
--- a/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Project/Standard/j2sefreeform.xml=Java\u81ea\u7531\u5f62\u5f0f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/freeform-project-java_ja.html b/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/freeform-project-java_ja.html
index 252b8e8..1624fc3 100755
--- a/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/freeform-project-java_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/resources/freeform-project-java_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/ui/Bundle_ja.properties
index f1a77a0..0354f6f 100755
--- a/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-freeform/java-freeform/org/netbeans/modules/java/freeform/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # OutputPanel
 LBL_Browse_Output=JAR\u307e\u305f\u306f\u30d5\u30a9\u30eb\u30c0\u3092\u53c2\u7167
diff --git a/netbeans-l10n-zip/src/ja/java/java-guards/java-guards/org/netbeans/modules/java/guards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-guards/java-guards/org/netbeans/modules/java/guards/Bundle_ja.properties
index dbddb8f..05ec1d0 100755
--- a/netbeans-l10n-zip/src/ja/java/java-guards/java-guards/org/netbeans/modules/java/guards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-guards/java-guards/org/netbeans/modules/java/guards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Name=Java\u306e\u4fdd\u8b77\u3055\u308c\u305f\u30bb\u30af\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-declarative-test/java-hints-declarative-test/org/netbeans/modules/java/hints/declarative/test/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-declarative-test/java-hints-declarative-test/org/netbeans/modules/java/hints/declarative/test/Bundle_ja.properties
index 4a3e8fd..fab0390 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-declarative-test/java-hints-declarative-test/org/netbeans/modules/java/hints/declarative/test/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-declarative-test/java-hints-declarative-test/org/netbeans/modules/java/hints/declarative/test/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java\u5ba3\u8a00\u578b\u306e\u30d2\u30f3\u30c8\u306e\u30c6\u30b9\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/Bundle_ja.properties
index 79aacd1..37f58b9 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/Bundle_ja.properties
@@ -1,44 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 FIX_RemoveFromParent=\u89aa\u304b\u3089{0}\u3092\u524a\u9664
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2008-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 2008-2009 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.
 LBL_Hint_loader_name=\u30d2\u30f3\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/debugging/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/debugging/Bundle_ja.properties
index 390b7e3..e78d315 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/debugging/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/debugging/Bundle_ja.properties
@@ -1,43 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 CTL_DebugAction=Jackpot\u30eb\u30fc\u30eb
 CTL_DebugTopComponent=Jackpot\u30eb\u30fc\u30eb\u30fb\u30c7\u30d0\u30c3\u30b0\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/idebinding/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/idebinding/Bundle_ja.properties
index 2975fe5..557e502 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/idebinding/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/idebinding/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_RemoveExpression=\u975evoid\u5f0f\u306e\u305f\u3081\u306b\u30ea\u30af\u30a8\u30b9\u30c8\u3055\u308c\u305f\u89aa\u304b\u3089\u306e\u524a\u9664\u306f\u76f4\u611f\u7684\u3067\u306f\u306a\u304f\u3001\u7d50\u679c\u306e\u4e88\u6e2c\u304c\u56f0\u96e3\u306b\u306a\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002\u5f0f\u306e\u672b\u5c3e\u306e';'\u304c\u6b20\u843d\u3057\u3066\u3044\u306a\u3044\u304b\u3069\u3046\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/resources/Bundle_ja.properties
index e28fbb5..e2a1572 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2009-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009-2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Name=Java\u5ba3\u8a00\u578b\u306e\u30d2\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/test/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/test/Bundle_ja.properties
index 49527fb..849e973 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/test/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-declarative/java-hints-declarative/org/netbeans/modules/java/hints/declarative/test/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_DeclarativeHintsTest_loader_name=DeclarativeHintsTest\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-legacy-spi/java-hints-legacy-spi/org/netbeans/modules/java/hints/legacy/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-legacy-spi/java-hints-legacy-spi/org/netbeans/modules/java/hints/legacy/spi/Bundle_ja.properties
index b372466..4b3eb4a 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-legacy-spi/java-hints-legacy-spi/org/netbeans/modules/java/hints/legacy/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-legacy-spi/java-hints-legacy-spi/org/netbeans/modules/java/hints/legacy/spi/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30ec\u30ac\u30b7\u30fcJava\u30d2\u30f3\u30c8SPI
 OpenIDE-Module-Deprecation-Message=\u304b\u308f\u308a\u306bJava\u30d2\u30f3\u30c8SPI (org.netbeans.spi.java.hints)\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-test/java-hints-test/org/netbeans/modules/java/hints/test/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-test/java-hints-test/org/netbeans/modules/java/hints/test/Bundle_ja.properties
index 545037c..1172f6c 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-test/java-hints-test/org/netbeans/modules/java/hints/test/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-test/java-hints-test/org/netbeans/modules/java/hints/test/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java\u30d2\u30f3\u30c8\u30fb\u30c6\u30b9\u30c8API
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/analysis/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/analysis/Bundle_ja.properties
index 8672670..1482d12 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/analysis/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/analysis/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DN_JavaHints=NetBeans Java\u30d2\u30f3\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/onsave/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/onsave/Bundle_ja.properties
index 55c0752..4063247 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/onsave/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/onsave/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OnSaveCustomizer.removeUnusedImports.text=\u672a\u4f7f\u7528\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u3092\u524a\u9664(&U)
 OnSaveCustomizer.organizeImports.text=\u30a4\u30f3\u30dd\u30fc\u30c8\u306e\u7de8\u6210(&O)
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/options/Bundle_ja.properties
index d10f694..287f95c 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/options/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_ShowAs_Label=\u8868\u793a\u5f62\u5f0f(&W):
 CTL_InTasklist_CheckBox=\u554f\u984c\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u8868\u793a(&P)
 CTL_Scope_Label=\u30b9\u30b3\u30fc\u30d7(&S):
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/refactoring/Bundle_ja.properties
index 9f27556..4bc22ad 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/spiimpl/refactoring/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_ApplyPattern=\u691c\u67fb\u3068\u5909\u63db
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/ui/Bundle_ja.properties
index cefd824..efc2813 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints-ui/java-hints-ui/org/netbeans/modules/java/hints/ui/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java\u30d2\u30f3\u30c8UI
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle_ja.properties
index 4aec69a..d89ac4f 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #
 # This bundle defines the localized name of the module, as will be shown
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/analyzer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/analyzer/Bundle_ja.properties
index 4f516c5..f0f1bb6 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/analyzer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/analyzer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=\u3053\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u306f\u3001\u30bd\u30fc\u30b9\u30fb\u30b3\u30fc\u30c9\u5185\u306eJavadoc\u30b3\u30e1\u30f3\u30c8\u3092\u78ba\u8a8d\u3057\u3001\u4fee\u6b63\u3067\u304d\u308b\u6a5f\u80fd\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8/\u30d1\u30c3\u30b1\u30fc\u30b8/\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3057\u3001"\u300c\u30bd\u30fc\u30b9\u300d-\u300cJavadoc\u3092\u89e3\u6790\u300d"\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Javadoc\u30a2\u30ca\u30e9\u30a4\u30b6
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/analyzer/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/analyzer/ui/Bundle_ja.properties
index ee78206..d886afb 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/analyzer/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/analyzer/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_AnalyzerAction=\u30a2\u30ca\u30e9\u30a4\u30b6(&A)
 CTL_AnalyzerTopComponent=\u30a2\u30ca\u30e9\u30a4\u30b6
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/bugs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/bugs/Bundle_ja.properties
index 39595c0..cf324ce 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/bugs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/bugs/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DESC_indentation=\u5b58\u5728\u3057\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308b\u5468\u56f2\u306e\u30d6\u30ed\u30c3\u30af\u3092\u63d0\u6848\u3059\u308b\u30a4\u30f3\u30c7\u30f3\u30c8\u306b\u3064\u3044\u3066\u8b66\u544a\u3057\u307e\u3059
 # {0} - the name of the annotation
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/control/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/control/Bundle_ja.properties
index ab5dbc7..6a83e46 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/control/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/control/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DESC_org.netbeans.modules.java.hints.RemoveUnnecessaryReturn=\u4e0d\u8981\u306areturn\u6587\u3092\u524a\u9664
 DESC_redundantConditional=\u5197\u9577\u306a\u6761\u4ef6\u6587
 DESC_redundantIf=\u5197\u9577\u306aif\u6587
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/encapsulation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/encapsulation/Bundle_ja.properties
index 6e57a1b..026e14d 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/encapsulation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/encapsulation/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_ProtectedField=protected\u30d5\u30a3\u30fc\u30eb\u30c9
 TXT_PublicField=public\u30d5\u30a3\u30fc\u30eb\u30c9
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/errors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/errors/Bundle_ja.properties
index ecb4f23..94619c2 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/errors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/errors/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/finalize/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/finalize/Bundle_ja.properties
index 68fc93d..4484848 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/finalize/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/finalize/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_CallFinalize=finalize()\u306e\u660e\u793a\u7684\u306a\u547c\u51fa\u3057
 TXT_FinalizeNotProtected=finalize()\u304cprotected\u5ba3\u8a00\u3055\u308c\u3066\u3044\u306a\u3044
 TXT_FinalizeDeclared=finalize()\u306e\u5ba3\u8a00
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/infrastructure/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/infrastructure/Bundle_ja.properties
index a7342da..be9580b 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/infrastructure/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/infrastructure/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #error messages:
 ERR_Not_Selected=\u30a8\u30c7\u30a3\u30bf\u3067\u958b\u304b\u308c\u3066\u3044\u308b\u30b5\u30dd\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/introduce/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/introduce/Bundle_ja.properties
index 2066c2b..9a50fd2 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/introduce/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/introduce/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #actions in the Refactor menu:
 CTL_IntroduceVariableAction=\u5909\u6570(&V)...
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jackpot/hintsimpl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jackpot/hintsimpl/Bundle_ja.properties
index 9e4d785..09a428c 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jackpot/hintsimpl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jackpot/hintsimpl/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30d2\u30f3\u30c8\u306e\u5b9f\u88c5
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/Bundle_ja.properties
index 00c5234..9ec4399 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/Bundle_ja.properties
@@ -1,48 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DESC_containsForIndexOf=String.contains\u3068\u7f6e\u63db\u3067\u304d\u308bString.indexOf\u306e\u4f7f\u7528\u65b9\u6cd5\u3092\u691c\u7d22\u3057\u307e\u3059
 DESC_IteratorToFor=\u53cd\u5fa9\u5b50\u306e\u5358\u7d14\u306a\u4f7f\u7528\u3092\u3001\u5bfe\u5fdc\u3059\u308bfor\u30eb\u30fc\u30d7\u3068\u7f6e\u304d\u63db\u3048\u307e\u3059\u3002
 DN_containsForIndexOf=String.indexOf\u306fString.contains\u306b\u7f6e\u63db\u3067\u304d\u307e\u3059
 DN_IteratorToFor=JDK 5 for\u30eb\u30fc\u30d7\u306e\u4f7f\u7528
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 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 2010 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.
 DN_org.netbeans.modules.java.hints.jdk.ThrowableInitCause=\u4e0d\u8981\u306aThrowable.initCause
 DESC_org.netbeans.modules.java.hints.jdk.ThrowableInitCause=\u5358\u7d14\u306a\u30b3\u30f3\u30b9\u30c8\u30e9\u30af\u30bf\u547c\u51fa\u3057\u306b\u7f6e\u63db\u3067\u304d\u308bThrowable.initCause\u306e\u547c\u51fa\u3057\u3092\u691c\u7d22\u3057\u307e\u3059\u3002\u300cgetMessage()\u306e\u7d50\u679c\u3092\u5e38\u306b\u4fdd\u6301\u300d\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9\u3092\u9078\u629e\u3057\u3066\u3044\u306a\u3044\u5834\u5408\u3001<code>(IllegalStateException) new IllegalStateException().initCause(ex)</code>\u304c<code>new IllegalStateException(ex)</code>\u306b\u66f8\u304d\u63db\u3048\u3089\u308c\u3001getMessage()\u306e\u5024\u304c\u5909\u66f4\u3055\u308c\u307e\u3059\u3002\u3053\u306e\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9\u3092\u9078\u629e\u3057\u3066\u3044\u308b\u5834\u5408\u3001\u3053\u306e\u30b3\u30fc\u30c9\u306f<code>new IllegalStateException(null,ex)</code>\u306b\u306a\u308a\u307e\u3059\u3002\u540c\u69d8\u306e\u30eb\u30fc\u30eb\u304c\u3001\u539f\u56e0\u306e<code>getMessage()</code>\u307e\u305f\u306f<code>getLocalizedMessage()</code>\u304b\u3089\u306e\u4f8b\u5916\u306e\u4f5c\u6210\u306b\u5f53\u3066\u306f\u307e\u308a\u307e\u3059\u3002
 ERR_AnnotationProcessors.overridingGetSupportedAnnotations=AbstractProcessor.getSupportedAnnotationTypes()\u304c\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3055\u308c\u305f\u305f\u3081\u3001\u958b\u767a\u4e2d\u306b\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u3053\u3068\u304c\u3042\u308a\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/mapreduce/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/mapreduce/Bundle_ja.properties
index 86aa0d3..1b60249 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/mapreduce/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/jdk/mapreduce/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DESC_ForLoopToFunctionalHint=\u547d\u4ee4\u30b9\u30bf\u30a4\u30eb\u30fb\u30eb\u30fc\u30d7\u306e\u304b\u308f\u308a\u306b\u95a2\u6570\u64cd\u4f5c\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002
 DN_ForLoopToFunctionalHint=\u95a2\u6570\u64cd\u4f5c\u306e\u4f7f\u7528
 ERR_ForLoopToFunctionalHint=\u95a2\u6570\u64cd\u4f5c\u3092\u4f7f\u7528\u53ef\u80fd
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/perf/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/perf/Bundle_ja.properties
index a91d7e5..c13cf28 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/perf/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/perf/Bundle_ja.properties
@@ -1,43 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 DN_org.netbeans.modules.java.hints.perf.ManualArrayCopy=\u624b\u52d5\u914d\u5217\u30b3\u30d4\u30fc
 DESC_org.netbeans.modules.java.hints.perf.ManualArrayCopy=for\u30eb\u30fc\u30d7\u3092\u4f7f\u3063\u3066\u624b\u52d5\u3067\u914d\u5217\u3092\u30b3\u30d4\u30fc\u3057\u3066\u3044\u308b\u7b87\u6240\u3092\u691c\u7d22\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/project/Bundle_ja.properties
index 1b88649..4f9d207 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/project/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_IncompleteClassPath=\u4e0d\u5b8c\u5168\u306a\u30af\u30e9\u30b9\u30d1\u30b9
 TXT_ResolveProjectProblems=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u554f\u984c\u3092\u89e3\u6c7a
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/Bundle_ja.properties
index ee98125..ef16097 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2010 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #
 # This bundle defines the localized name of the module, as will be shown
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/default_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/default_ja.properties
index 3dc4898..198241a 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/default_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/default_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 display.name=\u30c7\u30d5\u30a9\u30eb\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk5_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk5_ja.properties
index 3d4c043..0a73e61 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk5_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk5_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 display.name=JDK 5\u306b\u79fb\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk7_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk7_ja.properties
index 152cbcf..f66da8c 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk7_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk7_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 display.name=JDK 7\u306b\u79fb\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk8_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk8_ja.properties
index f2a8d55..02afc91 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk8_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/resources/jdk8_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Default properties of 'Convert to JDK8' configuration
 display.name=JDK 8\u306b\u79fb\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/suggestions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/suggestions/Bundle_ja.properties
index ff2e8e0..c7db613 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/suggestions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/suggestions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DESC_addExplicitLambdaParameters=\u660e\u793a\u7684\u306a\u30d1\u30e9\u30e1\u30fc\u30bf\u30fb\u30bf\u30a4\u30d7\u3092\u4f7f\u7528\u3059\u308b\u305f\u3081\u306b\u30e9\u30e0\u30c0\u3092\u5909\u63db\u3057\u307e\u3059
 DESC_expression2Return=\u5f0f\u3067\u306f\u306a\u304f\u30d6\u30ed\u30c3\u30af\u3092\u4f7f\u7528\u3059\u308b\u305f\u3081\u306b\u30e9\u30e0\u30c0\u672c\u4f53\u3092\u5909\u63db\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/testing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/testing/Bundle_ja.properties
index 1323053..5c428f2 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/testing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/testing/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DESC_assertEqualsForArrays=\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u914d\u5217\u3067\u3042\u308bassertEquals\u306b\u3064\u3044\u3066\u8b66\u544a\u3057\u307e\u3059
 DESC_assertEqualsIncovertibleTypes=\u5909\u63db\u3067\u304d\u306a\u3044Assert.assertEquals\u306e\u30d1\u30e9\u30e1\u30fc\u30bf
 DESC_assertEqualsMismatchedConstantVSReal=\u6b63\u3057\u304f\u306a\u3044Assert.assertEquals\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u9806\u5e8f
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/threading/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/threading/Bundle_ja.properties
index 913bbae..4a074f2 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/threading/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/threading/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DESC_CanBeFinal=final\u306b\u3067\u304d\u308b\u30d5\u30a3\u30fc\u30eb\u30c9(\u540c\u671f\u304c\u7c21\u7565\u5316\u3055\u308c\u660e\u78ba\u306b\u306a\u308a\u307e\u3059)\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059
 DN_CanBeFinal=\u30d5\u30a3\u30fc\u30eb\u30c9\u306ffinal\u306b\u3067\u304d\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/ui/Bundle_ja.properties
index c1f495b..bfb429d 100755
--- a/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-hints/java-hints/org/netbeans/modules/java/hints/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ClassNameList.btnRemove.text=\u9664\u53bb
 ClassNameList.btnUp.text=\u4e0a
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2sedeploy/java-j2sedeploy/org/netbeans/modules/java/j2sedeploy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2sedeploy/java-j2sedeploy/org/netbeans/modules/java/j2sedeploy/Bundle_ja.properties
index d2a987e..3634746 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2sedeploy/java-j2sedeploy/org/netbeans/modules/java/j2sedeploy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2sedeploy/java-j2sedeploy/org/netbeans/modules/java/j2sedeploy/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_No_Build_XML_Found=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u6709\u52b9\u306a\u30d3\u30eb\u30c9\u30fb\u30b9\u30af\u30ea\u30d7\u30c8{0}\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Java SE\u958b\u767a
 TXT_All=\u3059\u3079\u3066\u306e\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8
 TXT_AllInstallers=\u3059\u3079\u3066\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2sedeploy/java-j2sedeploy/org/netbeans/modules/java/j2sedeploy/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2sedeploy/java-j2sedeploy/org/netbeans/modules/java/j2sedeploy/ui/Bundle_ja.properties
index ac053ec..7a2f7db 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2sedeploy/java-j2sedeploy/org/netbeans/modules/java/j2sedeploy/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2sedeploy/java-j2sedeploy/org/netbeans/modules/java/j2sedeploy/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CreateBundleAction=\u30d1\u30c3\u30b1\u30fc\u30b8\u3068\u3057\u3066
 LBL_Category_Deployment=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/Bundle_ja.properties
index 3f5c81a..b0988ed 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java SE Embedded
 OpenIDE-Module-Short-Description=\u30ea\u30e2\u30fc\u30c8\u306eJ2SE\u5b9f\u884c\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/platform/Bundle_ja.properties
index 5b3902b..f59482c 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/platform/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_RemotePlatform=\u30ea\u30e2\u30fc\u30c8Java SE
 LBL_PlatformProperties=\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/ui/Bundle_ja.properties
index 322d74c..fc9172b 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CreateJREPanel.labelJRECreateLocation.text=EJDK\u306e\u5834\u6240(&E):
 
 CreateJREPanel.buttonBrowse.text=\u53c2\u7167(&B)...
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/wizard/Bundle_ja.properties
index 155f989..a3942cf 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seembedded/java-j2seembedded/org/netbeans/modules/java/j2seembedded/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TXT_RemotePlatform=\u30ea\u30e2\u30fc\u30c8Java Standard Edition
 TXT_SetUpRemotePlatform=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u8a2d\u5b9a
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/Bundle_ja.properties
index cec076c..f8adca5 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Manifest localization
 OpenIDE-Module-Name=Java SE\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3068\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/libraries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/libraries/Bundle_ja.properties
index 3e13dfc..0cb59dc 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/libraries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/libraries/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ContentMessage=\u5185\u5bb9(&C):
 CTL_AddContent=\u8ffd\u52a0(&A)...
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/platformdefinition/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/platformdefinition/Bundle_ja.properties
index b175ec2..642eee6 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/platformdefinition/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/platformdefinition/Bundle_ja.properties
@@ -1,42 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TXT_JavadocFilterName=\u30e9\u30a4\u30d6\u30e9\u30eaJavadoc (\u30d5\u30a9\u30eb\u30c0\u3001ZIP\u3001JAR\u30d5\u30a1\u30a4\u30eb)
 TXT_JavadocSearch={0}\u3067Javadoc\u3092\u691c\u7d22\u4e2d
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2004, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 TXT_Name=\u540d\u524d
 TXT_SourcesFilterName=\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30bd\u30fc\u30b9(\u30d5\u30a9\u30eb\u30c0\u3001ZIP\u3001JAR\u30d5\u30a1\u30a4\u30eb)
 TXT_SourcesFolder=\u30bd\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/queries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/queries/Bundle_ja.properties
index 4655c88..940ac92 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/queries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/queries/Bundle_ja.properties
@@ -1,41 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 # {0} - the root to attach Javadoc to
 TXT_AttachJavadocTo=Javadoc\u3092"{0}"\u306b\u30a2\u30bf\u30c3\u30c1
 # {0} - the root to attach Sources to
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/wizard/Bundle_ja.properties
index 0221f70..d6216c4 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/j2seplatform/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Autoconfiguration panel strings
 LBL_DetailsPanel_Name=\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u540d(&P):
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/jarloader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/jarloader/Bundle_ja.properties
index 3bad569..655da08 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/jarloader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seplatform/java-j2seplatform/org/netbeans/modules/java/jarloader/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_loaderName=JAR\u30d5\u30a1\u30a4\u30eb
 JarResolver=Java Archive\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seprofiles/java-j2seprofiles/org/netbeans/modules/java/j2seprofiles/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seprofiles/java-j2seprofiles/org/netbeans/modules/java/j2seprofiles/Bundle_ja.properties
index 3c73f53..e546ca3 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seprofiles/java-j2seprofiles/org/netbeans/modules/java/j2seprofiles/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seprofiles/java-j2seprofiles/org/netbeans/modules/java/j2seprofiles/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DESC_ClassFileHigherProfile=\u30e9\u30a4\u30d6\u30e9\u30ea{2}\u306e\u30af\u30e9\u30b9{1}\u3067\u4f7f\u7528\u3055\u308c\u308b{0}\u306b\u306f\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u304c\u5fc5\u8981\u3067\u3059: {3}
 DESC_LibraryHigherProfile=\u30e9\u30a4\u30d6\u30e9\u30ea{0}\u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306e\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u5c5e\u6027\u306b\u306f\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u304c\u5fc5\u8981\u3067\u3059: {1}
 DESC_LibraryInvalidProfile=\u30e9\u30a4\u30d6\u30e9\u30ea{0}\u306e\u30e9\u30a4\u30d6\u30e9\u30ea\u30fb\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306b\u306f\u7121\u52b9\u306a\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u5c5e\u6027\u5024\u304c\u3042\u308a\u307e\u3059
@@ -12,43 +29,6 @@
 MSG_ProjectHigherProfile=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u306f\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u304c\u5fc5\u8981\u3067\u3059: {0}
 MSG_SourceFileHigherProfile={0}\u306b\u306f\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u304c\u5fc5\u8981\u3067\u3059: {1}
 NAME_JdkProfiles=JRE 8\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u6e96\u62e0
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Java SE\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb
 TXT_ProfilesCustomizer_profiles=\u691c\u8a3c\u3059\u308b\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb(&P):
 AD_ProfilesCustomizer_profiles=\u5206\u6790\u3067\u691c\u8a3c\u3059\u308b\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/Bundle_ja.properties
index 516483a..156fb8c 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java SE\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/problems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/problems/Bundle_ja.properties
index af8b398..e480bc2 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/problems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/problems/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 DESC_MissingRuntimePlatform=\u69cb\u6210{0}\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30e9\u30f3\u30bf\u30a4\u30e0\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 DESC_InvalidRuntimePlatform=\u69cb\u6210{0}\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30e9\u30f3\u30bf\u30a4\u30e0\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306b\u4e92\u63db\u6027\u306e\u306a\u3044\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30ec\u30d9\u30eb\u307e\u305f\u306f\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u3059\u3002
 LBL_MissingRuntimePlatform=\u30e9\u30f3\u30bf\u30a4\u30e0\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u304c\u3042\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/Bundle_ja.properties
index 1f41270..b5313cd 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Actions
 LBL_Properties_Action=\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle_ja.properties
index dc2c46c..08a1ba8 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CustomizerDialog
 LBL_Customizer_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3 - {0}
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/desktop_ja.html b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/desktop_ja.html
index 93e0140..358af7e 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/desktop_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyLibrary_ja.html b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyLibrary_ja.html
index 4b3243e..3eaab48 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyLibrary_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyLibrary_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyProject_ja.html b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyProject_ja.html
index 8bc6a4c..2928b0d 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/emptyProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/existingProject_ja.html b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/existingProject_ja.html
index 77e7485..574d188 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/existingProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/resources/existingProject_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/wizards/Bundle_ja.properties
index c343f63..2c19e27 100755
--- a/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-j2seproject/java-j2seproject/org/netbeans/modules/java/j2seproject/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 template_app=Java\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
 template_existing=\u65e2\u5b58\u306e\u30bd\u30fc\u30b9\u3092\u4f7f\u7528\u3059\u308bJava\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/java-kit/java-kit/org/netbeans/modules/java/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-kit/java-kit/org/netbeans/modules/java/kit/Bundle_ja.properties
index 93bb20c..e0b8e5b 100755
--- a/netbeans-l10n-zip/src/ja/java/java-kit/java-kit/org/netbeans/modules/java/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-kit/java-kit/org/netbeans/modules/java/kit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Display-Category=Java SE
diff --git a/netbeans-l10n-zip/src/ja/java/java-lexer/java-lexer/org/netbeans/lib/java/lexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-lexer/java-lexer/org/netbeans/lib/java/lexer/Bundle_ja.properties
index 81e4358..4790303 100755
--- a/netbeans-l10n-zip/src/ja/java/java-lexer/java-lexer/org/netbeans/lib/java/lexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-lexer/java-lexer/org/netbeans/lib/java/lexer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java\u30ec\u30af\u30b5\u30fc
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/java-metrics/java-metrics/org/netbeans/modules/java/metrics/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-metrics/java-metrics/org/netbeans/modules/java/metrics/Bundle_ja.properties
index 2696c2e..91fc2d0 100755
--- a/netbeans-l10n-zip/src/ja/java/java-metrics/java-metrics/org/netbeans/modules/java/metrics/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-metrics/java-metrics/org/netbeans/modules/java/metrics/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java\u30b3\u30fc\u30c9\u30fb\u30e1\u30c8\u30ea\u30c3\u30af
 org-netbeans-modules-java-hints/rules/hints/metrics=Java\u30b3\u30fc\u30c9\u30fb\u30e1\u30c8\u30ea\u30c3\u30af
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-metrics/java-metrics/org/netbeans/modules/java/metrics/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-metrics/java-metrics/org/netbeans/modules/java/metrics/hints/Bundle_ja.properties
index f01f8b2..c278307 100755
--- a/netbeans-l10n-zip/src/ja/java/java-metrics/java-metrics/org/netbeans/modules/java/metrics/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-metrics/java-metrics/org/netbeans/modules/java/metrics/hints/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Method to complex
 DN_MethodTooComplex=\u30e1\u30bd\u30c3\u30c9\u304c\u8907\u96d1\u3059\u304e\u308b
diff --git a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/Bundle_ja.properties
index 6ca9b6c..a6c2126 100755
--- a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_Cannot_Resolve_File=\u30bf\u30a4\u30d7: {0}\u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093\u3002
 ERR_Not_Declared_Type=\u5ba3\u8a00\u3055\u308c\u305f\u578b\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/actions/Bundle_ja.properties
index 5e4897e..0089f79 100755
--- a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ShowHierarchyAction=\u30d5\u30a1\u30a4\u30eb\u968e\u5c64(&I)
 CTL_ShowHierarchyAtCaretAction=\u968e\u5c64(&H)
diff --git a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/base/Bundle_ja.properties
index d3366d9..e8272ca 100755
--- a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/base/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CellRenderer
 MSG_PleaseWait=\u30b9\u30ad\u30e3\u30f3\u4e2d...
diff --git a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/hierarchy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/hierarchy/Bundle_ja.properties
index 1e9d9f8..d17d2a1 100755
--- a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/hierarchy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/navigation/hierarchy/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_HierarchyTopComponent=\u968e\u5c64
 ERR_Cannot_Resolve_File=\u30bf\u30a4\u30d7: {0}\u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093\u3002
 ERR_Not_Declared_Type=\u5ba3\u8a00\u3055\u308c\u305f\u578b\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/stackanalyzer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/stackanalyzer/Bundle_ja.properties
index 2fb5286..1e35aeb 100755
--- a/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/stackanalyzer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-navigation/java-navigation/org/netbeans/modules/java/stackanalyzer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_AnalyzeStackAction=\u30b9\u30bf\u30c3\u30af\u3092\u89e3\u6790(&A)
 CTL_AnalyzeStackTopComponent=\u30b9\u30bf\u30c3\u30af\u89e3\u6790\u30a6\u30a3\u30f3\u30c9\u30a6
 HINT_AnalyzeStackTopComponent=\u3053\u308c\u306f\u30b9\u30bf\u30c3\u30af\u89e3\u6790\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/api/java/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/api/java/platform/Bundle_ja.properties
index e9ba0a0..9ffb2f9 100755
--- a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/api/java/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/api/java/platform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_PlatformsManager=Java\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30fb\u30de\u30cd\u30fc\u30b8\u30e3
 CTL_Close=\u9589\u3058\u308b
diff --git a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/Bundle_ja.properties
index 8f6cd97..3890302 100755
--- a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #PlatformSettings
 TXT_PlatformSettings=\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/Bundle_ja.properties
index 16e54f5..bf60449 100755
--- a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # File names on system filesystem
 # Each key is resource path to a primary file
diff --git a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/templates/javaplatform_ja.html b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/templates/javaplatform_ja.html
index ceb8afc..cf3d48d 100755
--- a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/templates/javaplatform_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/templates/javaplatform_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <HTML>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/templates/javaplatformdefinition_ja.html b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/templates/javaplatformdefinition_ja.html
index 3ad859a..ad0e434 100755
--- a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/templates/javaplatformdefinition_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/resources/templates/javaplatformdefinition_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/ui/Bundle_ja.properties
index 4697fed..3714135 100755
--- a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_PlatformHome=\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30fb\u30d5\u30a9\u30eb\u30c0:
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/wizard/Bundle_ja.properties
index b50ba69..8632b02 100755
--- a/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-platform-ui/java-platform-ui/org/netbeans/modules/java/platform/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 TXT_PlatformType=\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30fb\u30bf\u30a4\u30d7:
diff --git a/netbeans-l10n-zip/src/ja/java/java-platform/java-platform/org/netbeans/modules/java/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-platform/java-platform/org/netbeans/modules/java/platform/Bundle_ja.properties
index 646df25..fefdd14 100755
--- a/netbeans-l10n-zip/src/ja/java/java-platform/java-platform/org/netbeans/modules/java/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-platform/java-platform/org/netbeans/modules/java/platform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #PlatformSettings
 TXT_PlatformSettings=\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/java/java-preprocessorbridge/java-preprocessorbridge/org/netbeans/modules/java/preprocessorbridge/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-preprocessorbridge/java-preprocessorbridge/org/netbeans/modules/java/preprocessorbridge/Bundle_ja.properties
index 3c1fbb8..b909110 100755
--- a/netbeans-l10n-zip/src/ja/java/java-preprocessorbridge/java-preprocessorbridge/org/netbeans/modules/java/preprocessorbridge/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-preprocessorbridge/java-preprocessorbridge/org/netbeans/modules/java/preprocessorbridge/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Name=\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5\u30fb\u30d6\u30ea\u30c3\u30b8
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/Bundle_ja.properties
index f97ac74..be44852 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AD_ResolveButton=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u554f\u984c\u3092\u89e3\u6c7a
 AN_ResolveButton=\u89e3\u6c7a
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/AnnotationType_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/AnnotationType_ja.html
index e705051..e89dbd7 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/AnnotationType_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/AnnotationType_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Applet_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Applet_ja.html
index 4860cb5..0459be3 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Applet_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Applet_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Class_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Class_ja.html
index d7bf6d2..039894b 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Class_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Class_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Classes_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Classes_ja.html
index c8732f2..400cf05 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Classes_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Classes_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Empty_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Empty_ja.html
index 151ecb1..7dd08ea 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Empty_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Empty_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Enum_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Enum_ja.html
index 50a6610..944f0c8 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Enum_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Enum_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Exception_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Exception_ja.html
index 3736d68..7886182 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Exception_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Exception_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Interface_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Interface_ja.html
index 524af85..5acaa13 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Interface_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Interface_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/JApplet_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/JApplet_ja.html
index cf2a076..a5eaabd 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/JApplet_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/JApplet_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Main_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Main_ja.html
index 9c99834..309ee2f 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Main_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Main_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Package_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Package_ja.html
index c0bb85b..ce74a53 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Package_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Package_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Singleton_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Singleton_ja.html
index 5b3965b..3d4d770 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Singleton_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/Singleton_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/package-info_ja.html b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/package-info_ja.html
index 0fe663a..dbe3631 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/package-info_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/modules/java/project/ui/resources/package-info_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/spi/java/project/support/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/spi/java/project/support/ui/Bundle_ja.properties
index 61b8078..59c180e 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/spi/java/project/support/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-project-ui/java-project-ui/org/netbeans/spi/java/project/support/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACSD_MakeSharableWizard=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30d0\u30a4\u30ca\u30ea\u4f9d\u5b58\u6027\u306e\u9762\u3067\u81ea\u5df1\u5b8c\u7d50\u304a\u3088\u3073\u5171\u6709\u53ef\u80fd\u306b\u3059\u308b\u624b\u9806\u3092\u793a\u3059\u30a6\u30a3\u30b6\u30fc\u30c9\u30fb\u30c0\u30a4\u30a2\u30ed\u30b0\u3002
 ASCD_Browse_Libraries_Title=\u30e9\u30a4\u30d6\u30e9\u30ea\u5b9a\u7fa9\u304c\u3042\u308b\u30d5\u30a9\u30eb\u30c0\u3092\u63a2\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/java-project/java-project/org/netbeans/modules/java/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-project/java-project/org/netbeans/modules/java/project/Bundle_ja.properties
index 7843f6f..e9279ac 100755
--- a/netbeans-l10n-zip/src/ja/java/java-project/java-project/org/netbeans/modules/java/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-project/java-project/org/netbeans/modules/java/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/java-source-ant/java-source-ant/org/netbeans/modules/java/source/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source-ant/java-source-ant/org/netbeans/modules/java/source/ant/Bundle_ja.properties
index ec5f640..fcb269e 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source-ant/java-source-ant/org/netbeans/modules/java/source/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source-ant/java-source-ant/org/netbeans/modules/java/source/ant/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java\u30bd\u30fc\u30b9\u304b\u3089Ant\u306e\u30d0\u30a4\u30f3\u30c9
 OpenIDE-Module-Display-Category=Java
 ERR_CannotFindJava=\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093 - Java\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/api/java/source/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/api/java/source/Bundle_ja.properties
index a13c09c..12275b3 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/api/java/source/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/api/java/source/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 MSG_UnsufficientMemoryException=\u30d5\u30a1\u30a4\u30eb\u3092\u51e6\u7406\u3059\u308b\u305f\u3081\u306e\u30e1\u30e2\u30ea\u30fc\u304c\u4e0d\u8db3\u3057\u3066\u3044\u307e\u3059: {0}
 TXT_Question=\u8cea\u554f
diff --git a/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/base/Bundle_ja.properties
index 794671a..46c2d91 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/base/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Name=Java\u30bd\u30fc\u30b9\u30fb\u30d9\u30fc\u30b9
 LBL_HTTPJavadocDownload=HTTP Javadoc\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/parsing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/parsing/Bundle_ja.properties
index 1bf6481..461083f 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/parsing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/parsing/Bundle_ja.properties
@@ -1,48 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - the ZIP filename
 ERR_CorruptedZipFile=ZIP\u30d5\u30a1\u30a4\u30eb{0}\u306f\u7834\u640d\u3057\u3066\u3044\u308b\u304b\u3001\u5916\u90e8\u30d7\u30ed\u30bb\u30b9\u306b\u3088\u3063\u3066\u69cb\u7bc9\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u4e00\u90e8\u306e\u30a8\u30f3\u30c8\u30ea\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059
-#
-# 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.
-#
 FMT_InvalidFile=\u7121\u52b9\u307e\u305f\u306f\u524a\u9664\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb: {0}
 ERR_IncompleteClassPath=\u5fc5\u9808\u306e\u30af\u30e9\u30b9\u30d1\u30b9\u30fb\u30a8\u30f3\u30c8\u30ea\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u554f\u984c\u3092\u89e3\u6c7a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/save/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/save/Bundle_ja.properties
index 4fcac16..7d68654 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/save/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source-base/java-source-base/org/netbeans/modules/java/source/save/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TXT_UpdatePackageStatement=\u30d1\u30c3\u30b1\u30fc\u30b8\u6587\u3092\u66f4\u65b0
 TXT_ChangeClassName=\u30af\u30e9\u30b9\u540d\u3092\u5909\u66f4
diff --git a/netbeans-l10n-zip/src/ja/java/java-source-compat8/java-source-compat8/org/netbeans/modules/java/source/compat8/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source-compat8/java-source-compat8/org/netbeans/modules/java/source/compat8/Bundle_ja.properties
index 41de8dc..b42f3ff 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source-compat8/java-source-compat8/org/netbeans/modules/java/source/compat8/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source-compat8/java-source-compat8/org/netbeans/modules/java/source/compat8/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java\u30bd\u30fc\u30b9\u30fb\u30d9\u30fc\u30b98.0\u306e\u4e92\u63db\u6027
 OpenIDE-Module-Short-Description=8.0\u30ea\u30ea\u30fc\u30b9\u7528\u306b\u30b3\u30f3\u30d1\u30a4\u30eb\u3055\u308c\u305f\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u30d0\u30a4\u30ca\u30ea\u4e92\u63db\u6027\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-source-queries/java-source-queries/org/netbeans/modules/java/source/queries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source-queries/java-source-queries/org/netbeans/modules/java/source/queries/Bundle_ja.properties
index 054b454..1847db9 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source-queries/java-source-queries/org/netbeans/modules/java/source/queries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source-queries/java-source-queries/org/netbeans/modules/java/source/queries/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java\u30bd\u30fc\u30b9\u30fb\u554f\u5408\u305b
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-source-queriesimpl/java-source-queriesimpl/org/netbeans/modules/java/source/queriesimpl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source-queriesimpl/java-source-queriesimpl/org/netbeans/modules/java/source/queriesimpl/Bundle_ja.properties
index 0756016..e7d9f32 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source-queriesimpl/java-source-queriesimpl/org/netbeans/modules/java/source/queriesimpl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source-queriesimpl/java-source-queriesimpl/org/netbeans/modules/java/source/queriesimpl/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Name=Java\u30bd\u30fc\u30b9\u30fb\u554f\u5408\u305b\u306e\u5b9f\u88c5
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/Bundle_ja.properties
index cf1da60..785403c 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ClassResolver=\u30af\u30e9\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb
 JavaResolver.FileChooserName=Java\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/classfile/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/classfile/Bundle_ja.properties
index e5e7f1c..ba69841 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/classfile/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/classfile/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AttachSourcePanel.jLabel1.text=\u751f\u6210\u3055\u308c\u305f\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u8868\u793a\u3057\u3066\u3044\u307e\u3059\u3002\u30af\u30e9\u30b9\u306eJAR\u30d5\u30a1\u30a4\u30eb\u306b\u30bd\u30fc\u30b9\u304c\u30a2\u30bf\u30c3\u30c1\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 AttachSourcePanel.jButton1.text=\u30bd\u30fc\u30b9\u306e\u30a2\u30bf\u30c3\u30c1...
 TXT_OpenAttachedSource=\u30a2\u30bf\u30c3\u30c1\u3055\u308c\u305f\u30bd\u30fc\u30b9\u3092\u958b\u3044\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/source/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/source/Bundle_ja.properties
index 8a9fdca..80a3598 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/source/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/source/Bundle_ja.properties
@@ -1,46 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
-#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 GeneratedMethodBody=\u751f\u6210\u3055\u308c\u305f\u30e1\u30bd\u30c3\u30c9\u672c\u4f53
diff --git a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/source/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/source/resources/Bundle_ja.properties
index 77b661b..e006c55 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/source/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/source/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Editor.Export.Formatting.Java.displayName=Java
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_ja.properties
index 6a65a60..44f57ce 100755
--- a/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_TabsAndIndents=\u30bf\u30d6\u3068\u30a4\u30f3\u30c7\u30f3\u30c8
 LBL_CodeGeneration=\u9806\u5e8f\u4ed8\u3051
 LBL_Naming=\u547d\u540d
diff --git a/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/api/java/source/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/api/java/source/ui/Bundle_ja.properties
index 8eea990..5c185fa 100755
--- a/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/api/java/source/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/api/java/source/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #JavaCompletionDoc
 JCD-apinote=API\u306e\u6ce8\u610f:
diff --git a/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/Bundle_ja.properties
index fd65c69..e089232 100755
--- a/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #JavaTypeDescription
 LBL_JavaTypeDescription_nosource={0}\u306e\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/resources/Bundle_ja.properties
index 77118ea..d706da5 100755
--- a/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-sourceui/java-sourceui/org/netbeans/modules/java/source/ui/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=Java\u8a00\u8a9e\u56fa\u6709\u306eGUI\u3092\u4f5c\u6210\u3059\u308b\u305f\u3081\u306e\u3055\u307e\u3056\u307e\u306a\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fb\u30af\u30e9\u30b9\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Java\u30bd\u30fc\u30b9UI
diff --git a/netbeans-l10n-zip/src/ja/java/java-testrunner-ant/java-testrunner-ant/org/netbeans/modules/java/testrunner/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-testrunner-ant/java-testrunner-ant/org/netbeans/modules/java/testrunner/ant/Bundle_ja.properties
index 151560c..ea3a361 100755
--- a/netbeans-l10n-zip/src/ja/java/java-testrunner-ant/java-testrunner-ant/org/netbeans/modules/java/testrunner/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-testrunner-ant/java-testrunner-ant/org/netbeans/modules/java/testrunner/ant/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Ant Java Testrunner
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/Bundle_ja.properties
index 5f936ca..88f52cb 100755
--- a/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java Testrunner UI
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/api/Bundle_ja.properties
index 274be57..3e01bb1 100755
--- a/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/api/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_GotoSource=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
 
diff --git a/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/hints/Bundle_ja.properties
index 8643a09..a424e33 100755
--- a/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-testrunner-ui/java-testrunner-ui/org/netbeans/modules/java/testrunner/ui/hints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DESC_CreateTestClassHint=\u9078\u629e\u3057\u305f\u30bd\u30fc\u30b9\u30fb\u30af\u30e9\u30b9\u306e\u30c6\u30b9\u30c8\u30fb\u30af\u30e9\u30b9\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002
 DESC_CreateTestMethodsHint=\u9078\u629e\u3057\u305f\u30bd\u30fc\u30b9\u30fb\u30af\u30e9\u30b9\u306e\u3059\u3079\u3066\u306e\u30c6\u30b9\u30c8\u30fb\u30e1\u30bd\u30c3\u30c9\u3092\u751f\u6210\u3057\u307e\u3059\u3002
 DN_CreateTestClassHint=\u30c6\u30b9\u30c8\u30fb\u30af\u30e9\u30b9\u3092\u4f5c\u6210
diff --git a/netbeans-l10n-zip/src/ja/java/java-testrunner/java-testrunner/org/netbeans/modules/java/testrunner/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/java-testrunner/java-testrunner/org/netbeans/modules/java/testrunner/Bundle_ja.properties
index 0dce8e7..8b4e7dd 100755
--- a/netbeans-l10n-zip/src/ja/java/java-testrunner/java-testrunner/org/netbeans/modules/java/testrunner/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/java-testrunner/java-testrunner/org/netbeans/modules/java/testrunner/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java Testrunner
 
 NAME_JUnitMethodProvider=junit
diff --git a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/Bundle_ja.properties
index fced592..953c7a3 100755
--- a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #localized manifest
 OpenIDE-Module-Name=Javadoc
diff --git a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/hints/Bundle_ja.properties
index 684560e..4b83769 100755
--- a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/hints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - @param name
 DUPLICATE_PARAM_DESC=\u91cd\u8907\u3057\u305f@param\u540d: {0}
diff --git a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/resources/Bundle_ja.properties
index 64ded83..a8addb4 100755
--- a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 text/x-javadoc=Javadoc
 
diff --git a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/search/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/search/Bundle_ja.properties
index f8a2201..0750128 100755
--- a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/search/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/search/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Names of Controls
 CTL_SEARCH_MenuItem=Javadoc\u7d22\u5f15\u691c\u7d22(&S)
diff --git a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/settings/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/settings/Bundle_ja.properties
index 16026e7..3807a91 100755
--- a/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/settings/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/javadoc/javadoc/org/netbeans/modules/javadoc/settings/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Controls used in settings ( Nodes/PropertyEditors... )
 CTL_Documentation_settings=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/javaee-injection/javaee-injection/org/netbeans/modules/javaee/injection/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/javaee-injection/javaee-injection/org/netbeans/modules/javaee/injection/Bundle_ja.properties
index 425806f..8c47738 100755
--- a/netbeans-l10n-zip/src/ja/java/javaee-injection/javaee-injection/org/netbeans/modules/javaee/injection/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/javaee-injection/javaee-injection/org/netbeans/modules/javaee/injection/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java SE
 OpenIDE-Module-Name=\u6ce8\u5165\u554f\u5408\u305bAPI
 
diff --git a/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/Bundle_ja.properties
index 8b17c1a..240fe19 100755
--- a/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 JnlpTemplate=JNLP\u30d5\u30a1\u30a4\u30eb
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/JNLPTemplate_ja.html b/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/JNLPTemplate_ja.html
index d2894c0..7afb0c9 100755
--- a/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/JNLPTemplate_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/JNLPTemplate_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/launch_ja.html b/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/launch_ja.html
index afa9976..2af25f9 100755
--- a/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/launch_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/resources/launch_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
diff --git a/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/ui/customizer/Bundle_ja.properties
index 4e4cd0d..f6a2dea 100755
--- a/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/javawebstart/javawebstart/org/netbeans/modules/javawebstart/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Category_WebStart=Web Start
 LBL_Category_Default=<\u30c7\u30d5\u30a9\u30eb\u30c8\u69cb\u6210>
diff --git a/netbeans-l10n-zip/src/ja/java/jellytools-java/jellytools-java/org/netbeans/modules/jellytools/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/jellytools-java/jellytools-java/org/netbeans/modules/jellytools/java/Bundle_ja.properties
index 521b69c..ac23200 100755
--- a/netbeans-l10n-zip/src/ja/java/jellytools-java/jellytools-java/org/netbeans/modules/jellytools/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/jellytools-java/jellytools-java/org/netbeans/modules/jellytools/java/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Jelly\u30c4\u30fc\u30ebJava
 
diff --git a/netbeans-l10n-zip/src/ja/java/junit-ant-ui/junit-ant-ui/org/netbeans/modules/junit/ant/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/junit-ant-ui/junit-ant-ui/org/netbeans/modules/junit/ant/ui/Bundle_ja.properties
index 5599d95..675aca3 100755
--- a/netbeans-l10n-zip/src/ja/java/junit-ant-ui/junit-ant-ui/org/netbeans/modules/junit/ant/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/junit-ant-ui/junit-ant-ui/org/netbeans/modules/junit/ant/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Action_display_name_junit=JUnit 4.x\u3078\u306e\u66f4\u65b0
 Action_display_name_junit4=Hamcrest\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u8ffd\u52a0
 Action_start_msg_junit=\u30c6\u30b9\u30c8\u4f9d\u5b58\u6027\u306fJUnit 4.x\u30e9\u30a4\u30d6\u30e9\u30ea\u306b\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f\u3002
@@ -8,42 +25,5 @@
 Error_display_name_junit4=Hamcrest\u30d0\u30a4\u30ca\u30ea\u304c\u3042\u308a\u307e\u305b\u3093
 LBL_DebugTest=\u30c7\u30d0\u30c3\u30b0
 LBL_RerunTest=\u518d\u5b9f\u884c
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Ant JUnit UI
 
diff --git a/netbeans-l10n-zip/src/ja/java/junit-ant/junit-ant/org/netbeans/modules/junit/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/junit-ant/junit-ant/org/netbeans/modules/junit/ant/Bundle_ja.properties
index 81971b2..f7c6462 100755
--- a/netbeans-l10n-zip/src/ja/java/junit-ant/junit-ant/org/netbeans/modules/junit/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/junit-ant/junit-ant/org/netbeans/modules/junit/ant/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Ant JUnit
 
diff --git a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/Bundle_ja.properties
index 29864c6..98b3ed0 100755
--- a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JUnit\u30c6\u30b9\u30c8UI
 
 # Templates stuff
diff --git a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/actions/Bundle_ja.properties
index e3aeb0b..10eaad9 100755
--- a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Action_RunTestMethod=\u30d5\u30a9\u30fc\u30ab\u30b9\u3057\u305f\u30c6\u30b9\u30c8\u306e\u5b9f\u884c
 LBL_Action_DebugTestMethod=\u30d5\u30a9\u30fc\u30ab\u30b9\u3057\u305f\u30c6\u30b9\u30c8\u3092\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/EmptyJUnitTest_ja.html b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/EmptyJUnitTest_ja.html
index 88dc1d6..ee7ae88 100755
--- a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/EmptyJUnitTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/EmptyJUnitTest_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/JUnitFolder_ja.html b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/JUnitFolder_ja.html
index a6269a4..60845fa 100755
--- a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/JUnitFolder_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/JUnitFolder_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/SimpleJUnitTest_ja.html b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/SimpleJUnitTest_ja.html
index fae7d46..31022a0 100755
--- a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/SimpleJUnitTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/SimpleJUnitTest_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/TestSuite_ja.html b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/TestSuite_ja.html
index 0602b23..bd569ee 100755
--- a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/TestSuite_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/resources/TestSuite_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/wizards/Bundle_ja.properties
index 2a13809..4f54bcb 100755
--- a/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/junit-ui/junit-ui/org/netbeans/modules/junit/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2004-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Names of wizard steps:
diff --git a/netbeans-l10n-zip/src/ja/java/junit/junit/org/netbeans/modules/junit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/junit/junit/org/netbeans/modules/junit/Bundle_ja.properties
index 1478909..b58e9fe 100755
--- a/netbeans-l10n-zip/src/ja/java/junit/junit/org/netbeans/modules/junit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/junit/junit/org/netbeans/modules/junit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #
 # This Bundle is for JUnit module
diff --git a/netbeans-l10n-zip/src/ja/java/maven-checkstyle/maven-checkstyle/org/netbeans/modules/maven/checkstyle/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-checkstyle/maven-checkstyle/org/netbeans/modules/maven/checkstyle/Bundle_ja.properties
index 6490850..dabbb29 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-checkstyle/maven-checkstyle/org/netbeans/modules/maven/checkstyle/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-checkstyle/maven-checkstyle/org/netbeans/modules/maven/checkstyle/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Maven Checkstyle
 
diff --git a/netbeans-l10n-zip/src/ja/java/maven-checkstyle/maven-checkstyle/org/netbeans/modules/maven/format/checkstyle/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-checkstyle/maven-checkstyle/org/netbeans/modules/maven/format/checkstyle/Bundle_ja.properties
index 3769df5..7170192 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-checkstyle/maven-checkstyle/org/netbeans/modules/maven/format/checkstyle/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-checkstyle/maven-checkstyle/org/netbeans/modules/maven/format/checkstyle/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_MyAction=\u81ea\u5206\u306e\u30a2\u30af\u30b7\u30e7\u30f3
 # Sample ResourceBundle properties file
 OpenIDE-Module-Display-Category=Maven
diff --git a/netbeans-l10n-zip/src/ja/java/maven-coverage/maven-coverage/org/netbeans/modules/maven/coverage/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-coverage/maven-coverage/org/netbeans/modules/maven/coverage/Bundle_ja.properties
index a75c8f5..4b5e919 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-coverage/maven-coverage/org/netbeans/modules/maven/coverage/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-coverage/maven-coverage/org/netbeans/modules/maven/coverage/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=Maven Cobertura\u307e\u305f\u306fJaCoCo\u30d7\u30e9\u30b0\u30a4\u30f3\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u308b\u30c6\u30b9\u30c8\u30fb\u30ab\u30d0\u30ec\u30fc\u30b8\u30fb\u30ec\u30dd\u30fc\u30c8\u3092\u8868\u793a\u3059\u308b\u305f\u3081\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Maven\u30c6\u30b9\u30c8\u30fb\u30ab\u30d0\u30ec\u30fc\u30b8
diff --git a/netbeans-l10n-zip/src/ja/java/maven-embedder/maven-embedder/org/netbeans/modules/maven/embedder/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-embedder/maven-embedder/org/netbeans/modules/maven/embedder/Bundle_ja.properties
index 2ff085a..56267c0 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-embedder/maven-embedder/org/netbeans/modules/maven/embedder/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-embedder/maven-embedder/org/netbeans/modules/maven/embedder/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Maven
 OpenIDE-Module-Name=Maven Embedder
diff --git a/netbeans-l10n-zip/src/ja/java/maven-embedder/maven-embedder/org/netbeans/modules/maven/embedder/exec/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-embedder/maven-embedder/org/netbeans/modules/maven/embedder/exec/Bundle_ja.properties
index d0a8bd7..c0b6f70 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-embedder/maven-embedder/org/netbeans/modules/maven/embedder/exec/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-embedder/maven-embedder/org/netbeans/modules/maven/embedder/exec/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - downloaded resource name
 TXT_Download={0}\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
 # {0} - transferred resource name
diff --git a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/codegen/Bundle_ja.properties
index ea9589e..d550c02 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/codegen/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ERR_CannotWriteModel=\u30e2\u30c7\u30eb\u306b\u66f8\u304d\u8fbc\u3081\u307e\u305b\u3093: {0}
 LBL_Incomplete=\u4e0d\u5b8c\u5168\u306a\u7d50\u679c\u3067\u3059\u3002\u307e\u3060\u7d22\u5f15\u3092\u51e6\u7406\u3057\u3066\u3044\u307e\u3059...
 MSG_Cannot_Parse=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u69cb\u6587\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u3002\u5185\u5bb9\u3092\u751f\u6210\u3067\u304d\u307e\u305b\u3093\u3002
@@ -7,43 +24,6 @@
 NAME_Mirror=\u30df\u30e9\u30fc...
 NAME_Plugin=\u30d7\u30e9\u30b0\u30a4\u30f3...
 NAME_Profile=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb...
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 NewProfilePanel.lblId.text=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ebID(&P):
 NewProfilePanel.cbActProperty.text=\u30d7\u30ed\u30d1\u30c6\u30a3\u5225\u306b\u30a2\u30af\u30c6\u30a3\u30d6\u5316(&A):
 NewProfilePanel.cbActOS.text=OS\u5225\u306b\u30a2\u30af\u30c6\u30a3\u30d6\u5316(&O)
diff --git a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/Bundle_ja.properties
index e49d7ef..f66860e 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9(&S)
 ERR_In_Jar=jar\u30d5\u30a1\u30a4\u30eb\u30fb\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u6709\u52b9\u306aPOM\u3092\u8868\u793a\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/catalog/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/catalog/Bundle_ja.properties
index 38db4b1..9e55b1a 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/catalog/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/catalog/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DESC_MavenCatalog=Apache Maven\u30ab\u30bf\u30ed\u30b0
 LBL_MavenCatalog=Apache Maven\u30ab\u30bf\u30ed\u30b0
diff --git a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/effpom/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/effpom/Bundle_ja.properties
index 67687d1..b798c9a 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/effpom/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/grammar/effpom/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ACT_GoToSource=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
 AnnBar.File=\u30d5\u30a1\u30a4\u30eb: {0}
 AnnBar.Line=\u884c: {0}
diff --git a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/hyperlinks/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/hyperlinks/Bundle_ja.properties
index f2a3fc6..334a61e 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/hyperlinks/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/hyperlinks/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_GoToDeclaration=\u5ba3\u8a00\u3078\u79fb\u52d5
 goto-declaration=\u5ba3\u8a00\u3078\u79fb\u52d5
 Hint_prop_cannot=\u5f0f\u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093\n\u5b9a\u7fa9\u306b\u79fb\u52d5\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/navigator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/navigator/Bundle_ja.properties
index 0e0b70c..e5f3a74 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/navigator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-grammar/maven-grammar/org/netbeans/modules/maven/navigator/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # {0} - artifactid of a project
diff --git a/netbeans-l10n-zip/src/ja/java/maven-graph/maven-graph/org/netbeans/modules/maven/graph/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-graph/maven-graph/org/netbeans/modules/maven/graph/Bundle_ja.properties
index e8e23ac..7d6ea8e 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-graph/maven-graph/org/netbeans/modules/maven/graph/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-graph/maven-graph/org/netbeans/modules/maven/graph/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_ExcludeDep=\u9664\u5916
 ACT_Export_As_Image=\u30a4\u30e1\u30fc\u30b8\u3068\u3057\u3066\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/Bundle_ja.properties
index dd217d6..f3c3500 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Maven
 OpenIDE-Module-Name=Maven\u30d2\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/errors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/errors/Bundle_ja.properties
index a245e0b..5eaf05e 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/errors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/errors/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # {0} - classname
diff --git a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/pom/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/pom/Bundle_ja.properties
index 7381125..73568fa 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/pom/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/pom/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DESC_JavaNetRepositoryError=\u30d6\u30e9\u30c3\u30af\u30ea\u30b9\u30c8\u306b\u8f09\u3063\u3066\u3044\u308b\u30ea\u30dd\u30b8\u30c8\u30ea\u3001java.net\u306a\u3069\u306e\u30bb\u30f3\u30c8\u30e9\u30eb\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30de\u30fc\u30b8\u3055\u308c\u3066\u3044\u308b\u30ea\u30dd\u30b8\u30c8\u30ea\u3001\u307e\u305f\u306f\u4e0d\u6b63\u306a\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u542b\u307e\u308c\u3066\u3044\u308b\u306a\u3069\u3001\u4f7f\u7528\u3059\u308b\u3079\u304d\u3067\u306f\u306a\u3044\u30ea\u30dd\u30b8\u30c8\u30ea\u304c\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 DESC_ParentVersionError=\u73fe\u5728\u306e\u30bd\u30fc\u30b9\u306b\u3042\u308b\u89aa\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u304b\u3001\u3042\u308b\u3044\u306f\u6700\u5f8c\u306b\u78ba\u8a8d\u3055\u308c\u305f\u30ea\u30dd\u30b8\u30c8\u30ea\u7d22\u5f15\u306b\u57fa\u3065\u304f\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u73fe\u5728\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u4f7f\u7528\u3057\u3066\u3044\u308b\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/pom/props/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/pom/props/Bundle_ja.properties
index 5e84048..43254ec 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/pom/props/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/pom/props/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DESC_TurnToPropertyHint=\u9078\u629e\u3057\u305f\u30c6\u30ad\u30b9\u30c8\u306f\u5f0f\u306b\u5909\u63db\u3055\u308c\u3001\u65b0\u898f\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u5b9a\u7fa9\u3055\u308c\u307e\u3059\u3002\u9078\u629e\u3057\u305f\u5024\u3092\u542b\u3080\u65e2\u5b58\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3082\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002
 TIT_Enter=\u65b0\u898f\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u4f5c\u6210
 TIT_TurnToPropertyHint=\u9078\u629e\u3057\u305f\u30c6\u30ad\u30b9\u30c8\u3092\u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u5909\u63db
diff --git a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/ui/Bundle_ja.properties
index ce4a352..a9493d3 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BTN_Add=\u8ffd\u52a0
 LBL_Class_Name=\u30af\u30e9\u30b9\u540d
diff --git a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/ui/customizers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/ui/customizers/Bundle_ja.properties
index 66225ad..bea2569 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/ui/customizers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-hints/maven-hints/org/netbeans/modules/maven/hints/ui/customizers/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Option_Dialog=Maven\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u4f9d\u5b58\u6027\u3092\u691c\u7d22
 LBL_Option_InPlace=\u30a4\u30f3\u30d7\u30ec\u30fc\u30b9\u3067\u4f9d\u5b58\u6027\u3092\u63d0\u6848(\u4f4e\u901f)
diff --git a/netbeans-l10n-zip/src/ja/java/maven-indexer-ui/maven-indexer-ui/org/netbeans/modules/maven/indexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-indexer-ui/maven-indexer-ui/org/netbeans/modules/maven/indexer/Bundle_ja.properties
index c30295e..c7c2082 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-indexer-ui/maven-indexer-ui/org/netbeans/modules/maven/indexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-indexer-ui/maven-indexer-ui/org/netbeans/modules/maven/indexer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Maven
 OpenIDE-Module-Name=Maven\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u7d22\u5f15UI
diff --git a/netbeans-l10n-zip/src/ja/java/maven-indexer/maven-indexer/org/netbeans/modules/maven/indexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-indexer/maven-indexer/org/netbeans/modules/maven/indexer/Bundle_ja.properties
index 2ce6cea..92c9530 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-indexer/maven-indexer/org/netbeans/modules/maven/indexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-indexer/maven-indexer/org/netbeans/modules/maven/indexer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_findIndexableDirs=\u7d22\u5f15\u8a2d\u5b9a\u53ef\u80fd\u306a\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u6570\u3048\u3066\u3044\u307e\u3059...
 # {0} - repo name
diff --git a/netbeans-l10n-zip/src/ja/java/maven-indexer/maven-indexer/org/netbeans/modules/maven/indexer/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-indexer/maven-indexer/org/netbeans/modules/maven/indexer/api/Bundle_ja.properties
index 0ee15b1..505d1ac 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-indexer/maven-indexer/org/netbeans/modules/maven/indexer/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-indexer/maven-indexer/org/netbeans/modules/maven/indexer/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 local=\u30ed\u30fc\u30ab\u30eb
diff --git a/netbeans-l10n-zip/src/ja/java/maven-junit-ui/maven-junit-ui/org/netbeans/modules/maven/junit/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-junit-ui/maven-junit-ui/org/netbeans/modules/maven/junit/ui/Bundle_ja.properties
index f0e0d4a..541048f 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-junit-ui/maven-junit-ui/org/netbeans/modules/maven/junit/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-junit-ui/maven-junit-ui/org/netbeans/modules/maven/junit/ui/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_DebugTest=\u30c7\u30d0\u30c3\u30b0
 LBL_RerunTest=\u518d\u5b9f\u884c
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Maven JUnit UI
 
diff --git a/netbeans-l10n-zip/src/ja/java/maven-junit/maven-junit/org/netbeans/modules/maven/junit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-junit/maven-junit/org/netbeans/modules/maven/junit/Bundle_ja.properties
index 9cc7df4..6be79d3 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-junit/maven-junit/org/netbeans/modules/maven/junit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-junit/maven-junit/org/netbeans/modules/maven/junit/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Maven
 OpenIDE-Module-Name=Maven JUnit
diff --git a/netbeans-l10n-zip/src/ja/java/maven-kit/maven-kit/org/netbeans/modules/maven/feature/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-kit/maven-kit/org/netbeans/modules/maven/feature/Bundle_ja.properties
index c32b82f..8d569b5 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-kit/maven-kit/org/netbeans/modules/maven/feature/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-kit/maven-kit/org/netbeans/modules/maven/feature/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Java SE
 OpenIDE-Module-Name=Maven
diff --git a/netbeans-l10n-zip/src/ja/java/maven-model/maven-model/org/netbeans/modules/maven/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-model/maven-model/org/netbeans/modules/maven/model/Bundle_ja.properties
index f5177be..70f39e3 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-model/maven-model/org/netbeans/modules/maven/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-model/maven-model/org/netbeans/modules/maven/model/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Maven\u30a8\u30c7\u30a3\u30bf\u30fb\u30e2\u30c7\u30eb
 ERR_POM=pom.xml\u3092\u66f8\u304d\u8fbc\u3081\u307e\u305b\u3093\u3002\u7406\u7531: {0}
 ERR_SETTINGS=settings.xml\u3092\u66f8\u304d\u8fbc\u3081\u307e\u305b\u3093\u3002\u7406\u7531: {0}
diff --git a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/Bundle_ja.properties
index 077ff2f..0671266 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Maven
 OpenIDE-Module-Name=Maven OSGi
 PRBL_DESC=\u6700\u7d42\u30d0\u30f3\u30c9\u30ebjar\u306b\u3001\u73fe\u5728\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u767a\u751f\u5143\u3067\u306f\u306a\u3044\u30af\u30e9\u30b9\u304c\u542b\u307e\u308c\u3066\u3044\u308b\u5834\u5408\u3001NetBeans\u5185\u90e8\u30b3\u30f3\u30d1\u30a4\u30e9\u306f\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30bd\u30fc\u30b9\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u306e\u305f\u3081\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u3057\u305f\u5834\u5408\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30bd\u30fc\u30b9\u30fb\u30b3\u30fc\u30c9\u3067\u5b9f\u884c\u3057\u305f\u5909\u66f4\u306f\u3001\u5f93\u5c5e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306e\u307f\u8868\u793a\u3055\u308c\u307e\u3059\u3002\u307e\u305f\u3001\u5f93\u5c5e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u306e\u4f7f\u7528\u65b9\u6cd5\u3092\u691c\u51fa\u3067\u304d\u306a\u3044\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u306a\u3069\u306e\u6a5f\u80fd\u306b\u9069\u7528\u3055\u308c\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/customizer/Bundle_ja.properties
index 2f6d386..343c8c4 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/customizer/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 TIT_Packages=\u30d1\u30c3\u30b1\u30fc\u30b8\u3092\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
 PackagesPanel.exportTable.columnModel.title3=\u30bf\u30a4\u30c8\u30eb4
 PackagesPanel.exportTable.columnModel.title2=\u30bf\u30a4\u30c8\u30eb3
diff --git a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/Bundle_ja.properties
index 6e8943b..acc6058 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 template.activator=\u30d0\u30f3\u30c9\u30eb\u30fb\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30bf
 template.project.OSGi=OSGi\u30d0\u30f3\u30c9\u30eb
 TITLE_x_of_y={0}/{1}
diff --git a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/OSGiDescription_ja.html b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/OSGiDescription_ja.html
index 2fbaead..1ac44e0 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/OSGiDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/OSGiDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/new_OSGi_activator_ja.html b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/new_OSGi_activator_ja.html
index 185242e..9a3d6fb 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/new_OSGi_activator_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/maven-osgi/maven-osgi/org/netbeans/modules/maven/osgi/templates/new_OSGi_activator_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/java/maven-persistence/maven-persistence/org/netbeans/modules/maven/persistence/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-persistence/maven-persistence/org/netbeans/modules/maven/persistence/Bundle_ja.properties
index 4b444d0..a0ecb39 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-persistence/maven-persistence/org/netbeans/modules/maven/persistence/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-persistence/maven-persistence/org/netbeans/modules/maven/persistence/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Maven
 OpenIDE-Module-Name=Maven\u6301\u7d9a\u6027
diff --git a/netbeans-l10n-zip/src/ja/java/maven-refactoring/maven-refactoring/org/netbeans/modules/maven/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-refactoring/maven-refactoring/org/netbeans/modules/maven/refactoring/Bundle_ja.properties
index e08a060..253dad6 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-refactoring/maven-refactoring/org/netbeans/modules/maven/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-refactoring/maven-refactoring/org/netbeans/modules/maven/refactoring/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Maven\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
 # {0} - repository id
 RepositoryTreeElement.text=Maven\u30ea\u30dd\u30b8\u30c8\u30ea: <b>{0}</b>
diff --git a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/Bundle_ja.properties
index eb07e9d..f6cb9f9 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_Add_Repo=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u8ffd\u52a0...
 ACT_Edit=\u7de8\u96c6...
diff --git a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/dependency/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/dependency/Bundle_ja.properties
index 785713c..6bc7c05 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/dependency/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/dependency/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Add_As_Dependency=\u4f9d\u5b58\u6027\u3068\u3057\u3066\u8ffd\u52a0...
 TIT_Add_Dependency=\u4f9d\u5b58\u6027\u306e\u8ffd\u52a0
diff --git a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/dependency/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/dependency/ui/Bundle_ja.properties
index 716c426..7890401 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/dependency/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/dependency/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - name of this artifact
 LBL_Description=<html>{0}\u3092\u4f9d\u5b58\u6027\u3068\u3057\u3066\u8ffd\u52a0:
diff --git a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/register/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/register/Bundle_ja.properties
index 9bd5764..a0a6af8 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/register/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/register/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Repo_EDIT=OK
 LBL_Repo_ID=ID(&I):
diff --git a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/ui/Bundle_ja.properties
index a218dd3..3dd151e 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-repository/maven-repository/org/netbeans/modules/maven/repository/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_Open=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8\u306e\u8a73\u7d30\u3092\u8868\u793a
 BasicArtifactPanel.lblGroupId.text=\u30b0\u30eb\u30fc\u30d7ID:
diff --git a/netbeans-l10n-zip/src/ja/java/maven-search/maven-search/org/netbeans/modules/maven/search/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-search/maven-search/org/netbeans/modules/maven/search/Bundle_ja.properties
index 1fb9de0..f6d8adf 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-search/maven-search/org/netbeans/modules/maven/search/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-search/maven-search/org/netbeans/modules/maven/search/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Maven\u30af\u30a4\u30c3\u30af\u691c\u7d22
 QuickSearch/MavenRepositories=Maven\u30ea\u30dd\u30b8\u30c8\u30ea
diff --git a/netbeans-l10n-zip/src/ja/java/maven-spring/maven-spring/org/netbeans/modules/maven/spring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven-spring/maven-spring/org/netbeans/modules/maven/spring/Bundle_ja.properties
index a3c88fd..3888d4a 100755
--- a/netbeans-l10n-zip/src/ja/java/maven-spring/maven-spring/org/netbeans/modules/maven/spring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven-spring/maven-spring/org/netbeans/modules/maven/spring/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Maven
 OpenIDE-Module-Name=Maven Spring
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/Bundle_ja.properties
index dd9a18f..72432bf 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_Build_Deps=\u4f9d\u5b58\u6027\u3067\u30d3\u30eb\u30c9
 ACT_CloseRequired=\u5fc5\u9808\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u9589\u3058\u308b
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/Bundle_ja.properties
index 5d7b46b..45ecb17 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_Library=\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u4f5c\u6210
 ACT_Reload_Project=POM\u306e\u518d\u30ed\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/scm/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/scm/Bundle_ja.properties
index b28ca2f..216c001 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/scm/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/scm/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Checkout=\u30bd\u30fc\u30b9\u306e\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8
 LBL_SCM=SCM
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/scm/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/scm/ui/Bundle_ja.properties
index 145ac8f..dbe16a2 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/scm/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/scm/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BTN_Browse=\u53c2\u7167(&B)...
 BTN_Checkout=\u30c1\u30a7\u30c3\u30af\u30fb\u30a2\u30a6\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/usages/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/usages/Bundle_ja.properties
index d0fd871..268d9f7 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/usages/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/usages/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_FindartifactUsages=\u4f7f\u7528\u72b6\u6cc1\u3092\u691c\u7d22
 TIT_FindartifactUsages=\u4f7f\u7528\u72b6\u6cc1
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/usages/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/usages/ui/Bundle_ja.properties
index 25c4c45..0aadab7 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/usages/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/actions/usages/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Dependancy=\u76f4\u63a5\u306e\u4f9d\u5b58\u6027
 # {0} - maven coordinates
 LBL_Description=<html>\u4f9d\u5b58\u6027\u3067{0}\u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8</html>
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/Bundle_ja.properties
index 9bd5b77..a5e1677 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/customizer/Bundle_ja.properties
index 389ab3c..49885bd 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/customizer/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - config ID
 # {1} - list of profiles
 CustomConfig1={0}(\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb: {1})
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/customizer/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/customizer/support/Bundle_ja.properties
index e4f6707..a1647c6 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/customizer/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/customizer/support/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 HINT_inherited=\u5024\u306f\u89aaPOM\u304b\u3089\u7d99\u627f\u3055\u308c\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/output/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/output/Bundle_ja.properties
index 0f1699b..664b53d 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/output/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/api/output/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - file name
 NoSource="{0}"\u306b\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 # {0} - class name
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/classpath/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/classpath/Bundle_ja.properties
index e48a7a0..3caa026 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/classpath/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/classpath/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - name suffix
 SG_Generated_Sources=\u751f\u6210\u3055\u308c\u305f\u30bd\u30fc\u30b9({0})
 # {0} - name suffix
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/configurations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/configurations/Bundle_ja.properties
index f1d9e9f..50c0a0d 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/configurations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/configurations/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ConfigurationsPanel.lblConfigurations.text=\u69cb\u6210(&C):
 ConfigurationsPanel.btnAdd.text=\u8ffd\u52a0(&A)...
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/cos/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/cos/Bundle_ja.properties
index 5bc1d6b..dd1b4f1 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/cos/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/cos/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CosChecker.no_test_cos.details=\u300c\u4fdd\u5b58\u6642\u306b\u30b3\u30f3\u30d1\u30a4\u30eb\u300d\u30e2\u30fc\u30c9\u3067\u306f\u3001\u591a\u304f\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u5358\u4e00\u306e\u30c6\u30b9\u30c8\u5b9f\u884c\u306e\u901f\u5ea6\u304c\u5411\u4e0a\u3057\u307e\u3059\u3002
 CosChecker.no_test_cos.title=\u300c\u4fdd\u5b58\u6642\u306b\u30b3\u30f3\u30d1\u30a4\u30eb\u300d\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u305b\u3093
 
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/customizer/Bundle_ja.properties
index 5189c44..e26a71f 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ActionMappings.cbRecursively.text=\u518d\u5e30\u7684\u306b\u30d3\u30eb\u30c9(\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u4f7f\u7528)(&B)
 ActionMappings.fileExpressions=IDE\u9078\u629e\u5f0f
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/dependencies/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/dependencies/Bundle_ja.properties
index 9863cc3..8a137a5 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/dependencies/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/dependencies/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ExcludeDependencyPanel.jLabel1.text=\u63a8\u79fb\u7684\u306a\u4f9d\u5b58\u6027
 ExcludeDependencyPanel.jLabel2.text=\u76f4\u63a5\u306e\u4f9d\u5b58\u6027\u304b\u3089\u9664\u5916
 LBL_NotAvailable=(\u4f7f\u7528\u4e0d\u53ef)
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/Bundle_ja.properties
index dfb464c..d9c3e44 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_OptionsAction=Maven\u8a2d\u5b9a
 LBL_ShowOverviewAction=\u30d3\u30eb\u30c9\u306e\u6982\u8981\u306e\u8868\u793a
 ResumeAction_could_not_find_module=\u30d3\u30eb\u30c9\u3092\u518d\u958b\u3059\u308b\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u7279\u5b9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/navigator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/navigator/Bundle_ja.properties
index ef52853..e526bff 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/navigator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/navigator/Bundle_ja.properties
@@ -1,46 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ACT_Execute=\u30b4\u30fc\u30eb\u306e\u5b9f\u884c
 ACT_Execute_help=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u8868\u793a...
 ACT_Execute_mod=\u4fee\u98fe\u5b50\u306b\u3088\u308b\u30b4\u30fc\u30eb\u306e\u5b9f\u884c...
 GOALS_HINT=pom.xml\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u57fa\u3065\u3044\u3066\u4f7f\u7528\u53ef\u80fd\u306a\u30b4\u30fc\u30eb\u3092\u8868\u793a
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2013 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
 GOALS_NAME=\u95a2\u9023\u3059\u308b\u30b4\u30fc\u30eb
 HINT_Panel_hide=\u30ca\u30d3\u30b2\u30fc\u30bf\u304c\u30a2\u30af\u30c6\u30a3\u30d6\u306a\u3068\u304d\u306b\u975e\u8868\u793a\u307e\u305f\u306f\u8868\u793a\u3059\u308b\u306b\u306f\u3001{0}\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u304b\u3001\u307e\u305f\u306f\u62bc\u3057\u307e\u3059\u3002
 LBL_Show_Help=\u30d8\u30eb\u30d7\u30fb\u30b4\u30fc\u30eb\u3092\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/ui/Bundle_ja.properties
index 5447b76..1d9d643 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/execute/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ACT_DEBUG_Plugin=\u30d7\u30e9\u30b0\u30a4\u30f3Mojo\u30bd\u30fc\u30b9\u306e\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/modelcache/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/modelcache/Bundle_ja.properties
index 62fe572..792413d 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/modelcache/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/modelcache/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Incomplete_Project_Desc=Maven\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u90e8\u5206\u7684\u306b\u30ed\u30fc\u30c9\u3055\u308c\u307e\u3057\u305f\u3002\u30d3\u30eb\u30c9\u3092\u8a66\u307f\u307e\u3059\u3002
 LBL_Incomplete_Project_Name=<\u90e8\u5206\u7684\u306b\u30ed\u30fc\u30c9\u3055\u308c\u305fMaven\u30d7\u30ed\u30b8\u30a7\u30af\u30c8>
 TXT_RuntimeException=\u30ed\u30fc\u30c9\u4e2d\u306bApache Maven embedder\u3067\u30e9\u30f3\u30bf\u30a4\u30e0\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/Bundle_ja.properties
index 29f3087..dd33cfa 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 COL_Key=\u30ad\u30fc
 COL_Value=\u5024
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/ExistingDescription_ja.html b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/ExistingDescription_ja.html
index 6b7f6f6..f814ad6 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/ExistingDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/ExistingDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/MavenDescription_ja.html b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/MavenDescription_ja.html
index 9141224..e129f80 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/MavenDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/MavenDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/Bundle_ja.properties
index 99c1143..c03f896 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_CreateProjectStep2=\u540d\u524d\u3068\u5834\u6240
 LBL_Maven_POM_Archetype=POM\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 LBL_Maven_Quickstart_Archetype=Java\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/pom-root_ja.html b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/pom-root_ja.html
index 1aeeeaa..fea2754 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/pom-root_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/pom-root_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/quickstart_ja.html b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/quickstart_ja.html
index 5858b31..a0118dc 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/quickstart_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/idenative/quickstart_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/javafx_ja.html b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/javafx_ja.html
index 00a1ad5..a259951 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/javafx_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/javafx_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/pom-root_ja.html b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/pom-root_ja.html
index 7aed192..fea2754 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/pom-root_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/pom-root_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/quickstart_ja.html b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/quickstart_ja.html
index 0b9ce1a..a0118dc 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/quickstart_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/newproject/quickstart_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/nodes/Bundle_ja.properties
index 5d727d0..ce185b1 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/nodes/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/operations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/operations/Bundle_ja.properties
index bf025a9..a262918 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/operations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/operations/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NAME_Artifact=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8ID
 NAME_Folder=\u30d5\u30a9\u30eb\u30c0\u540d
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/options/Bundle_ja.properties
index 5f2d0fb..818d870 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CAT_Appearance=\u5916\u89b3
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/output/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/output/Bundle_ja.properties
index 50d0a75..9f36987 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/output/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/output/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_CannotFollowLink1=\u30ea\u30f3\u30af\u3092\u305f\u3069\u308c\u307e\u305b\u3093\u3002\u30c6\u30b9\u30c8\u3092\u51fa\u529b\u3059\u308b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 MSG_CannotFollowLink2=\u30ea\u30f3\u30af\u3092\u305f\u3069\u308c\u307e\u305b\u3093\u3002\u30c6\u30b9\u30c8\u306e\u30ec\u30dd\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 MSG_CannotFollowLink3=\u30ea\u30f3\u30af\u3092\u305f\u3069\u308c\u307e\u305b\u3093\u3002\u30ec\u30dd\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u306f\u73fe\u5728maven\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u3088\u3063\u3066\u6240\u6709\u3055\u308c\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/problems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/problems/Bundle_ja.properties
index df3a483..f754e80 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/problems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/problems/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_OPEN_FILE_START=\u5f71\u97ff\u3092\u53d7\u3051\u308b\u30d5\u30a1\u30a4\u30eb\u304c\u958b\u304b\u308c\u307e\u3057\u305f\u3002
 ACT_start_validate=\u30d7\u30e9\u30a4\u30df\u30f3\u30b0\u30fb\u30d3\u30eb\u30c9\u304c\u958b\u59cb\u3055\u308c\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/queries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/queries/Bundle_ja.properties
index e9deb46..17f79b9 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/queries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/queries/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - artifact ID
 attaching={0}\u3092\u30a2\u30bf\u30c3\u30c1\u3057\u3066\u3044\u307e\u3059
 DESC_SourceJavadocAttacher=\u65e2\u77e5\u306eMaven\u30ea\u30dd\u30b8\u30c8\u30ea\u5185\u306ejavadoc/\u30bd\u30fc\u30b9\u3092\u30eb\u30c3\u30af\u30a2\u30c3\u30d7
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/runjar/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/runjar/Bundle_ja.properties
index 42bd5b7..25607ec 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/runjar/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/runjar/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/spi/grammar/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/spi/grammar/Bundle_ja.properties
index 336f1c6..fd054e6 100755
--- a/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/spi/grammar/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/maven/maven/org/netbeans/modules/maven/spi/grammar/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TIT_Exclude=\u4f9d\u5b58\u306e\u9664\u5916\u9805\u76ee\u306e\u8ffd\u52a0
 
diff --git a/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/Bundle_ja.properties
index f1090ca..c139ca3 100755
--- a/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Nashorn\u5b9f\u884c
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/actions/Bundle_ja.properties
index 09095f9..478a433 100755
--- a/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DebugJSActionName=\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30d0\u30c3\u30b0
 RunJSActionName=\u30d5\u30a1\u30a4\u30eb\u306e\u5b9f\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/options/Bundle_ja.properties
index 1e96b89..38f0675 100755
--- a/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/nashorn-execution/nashorn-execution/org/netbeans/modules/nashorn/execution/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Nashorn=Nashorn
 KW_JavaScript=JavaScript,Nashorn
diff --git a/netbeans-l10n-zip/src/ja/java/org-jdesktop-beansbinding/org-jdesktop-beansbinding/org/netbeans/libs/beansbinding/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-jdesktop-beansbinding/org-jdesktop-beansbinding/org/netbeans/libs/beansbinding/Bundle_ja.properties
index a7f0717..e95a2b9 100755
--- a/netbeans-l10n-zip/src/ja/java/org-jdesktop-beansbinding/org-jdesktop-beansbinding/org/netbeans/libs/beansbinding/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-jdesktop-beansbinding/org-jdesktop-beansbinding/org/netbeans/libs/beansbinding/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Beans Binding\u306e\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-api-debugger-jpda/org-netbeans-api-debugger-jpda/org/netbeans/api/debugger/jpda/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-api-debugger-jpda/org-netbeans-api-debugger-jpda/org/netbeans/api/debugger/jpda/Bundle_ja.properties
index c072247..12ecf68 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-api-debugger-jpda/org-netbeans-api-debugger-jpda/org/netbeans/api/debugger/jpda/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-api-debugger-jpda/org-netbeans-api-debugger-jpda/org/netbeans/api/debugger/jpda/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #manifest's description entries
 OpenIDE-Module-Name=JPDA\u30c7\u30d0\u30c3\u30acAPI
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-api-java/org-netbeans-api-java/org/netbeans/api/java/queries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-api-java/org-netbeans-api-java/org/netbeans/api/java/queries/Bundle_ja.properties
index 1638a49..fd9f7cc 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-api-java/org-netbeans-api-java/org/netbeans/api/java/queries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-api-java/org-netbeans-api-java/org/netbeans/api/java/queries/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NAME_Compact1=\u30b3\u30f3\u30d1\u30af\u30c81
 NAME_Compact2=\u30b3\u30f3\u30d1\u30af\u30c82
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-api-maven/org-netbeans-api-maven/org/netbeans/api/maven/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-api-maven/org-netbeans-api-maven/org/netbeans/api/maven/Bundle_ja.properties
index c1f4f32..3a95ef0 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-api-maven/org-netbeans-api-maven/org/netbeans/api/maven/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-api-maven/org-netbeans-api-maven/org/netbeans/api/maven/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Maven
 OpenIDE-Module-Name=Maven API
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-lib-nbjavac/org-netbeans-lib-nbjavac/org/netbeans/lib/nbjavac/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-lib-nbjavac/org-netbeans-lib-nbjavac/org/netbeans/lib/nbjavac/Bundle_ja.properties
index 10a5188..49fc55e 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-lib-nbjavac/org-netbeans-lib-nbjavac/org/netbeans/lib/nbjavac/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-lib-nbjavac/org-netbeans-lib-nbjavac/org/netbeans/lib/nbjavac/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=NetBeans Javac\u30e9\u30a4\u30d6\u30e9\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-cglib/org-netbeans-libs-cglib/org/netbeans/libs/cglib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-cglib/org-netbeans-libs-cglib/org/netbeans/libs/cglib/Bundle_ja.properties
index e2eb3b9..93fa9d1 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-cglib/org-netbeans-libs-cglib/org/netbeans/libs/cglib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-cglib/org-netbeans-libs-cglib/org/netbeans/libs/cglib/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Code Generation Library\u306e\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-javacapi/org-netbeans-libs-javacapi/org/netbeans/libs/javacapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-javacapi/org-netbeans-libs-javacapi/org/netbeans/libs/javacapi/Bundle_ja.properties
index 9a49b0b..1d6f192 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-javacapi/org-netbeans-libs-javacapi/org/netbeans/libs/javacapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-javacapi/org-netbeans-libs-javacapi/org/netbeans/libs/javacapi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Long-Description=JSR 199\u3001JSR 269\u306b\u3088\u3063\u3066\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u308b\u3068\u304a\u308a\u306ejavac public API\u3068\u3001JDK 6\u3067\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u308bcom.sun.source\u30d1\u30c3\u30b1\u30fc\u30b8\u3002
 OpenIDE-Module-Name=Javac API\u30e9\u30c3\u30d1\u30fc
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-javacimpl/org-netbeans-libs-javacimpl/org/netbeans/libs/javacimpl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-javacimpl/org-netbeans-libs-javacimpl/org/netbeans/libs/javacimpl/Bundle_ja.properties
index e6da171..3379c51 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-javacimpl/org-netbeans-libs-javacimpl/org/netbeans/libs/javacimpl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-javacimpl/org-netbeans-libs-javacimpl/org/netbeans/libs/javacimpl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Long-Description=Javac API\u30af\u30e9\u30b9\u3092\u5b9f\u88c5\u3059\u308bjavac\u5b9f\u88c5\u30af\u30e9\u30b9\u3067\u3059\u3002\u3053\u308c\u3089\u306e\u30af\u30e9\u30b9\u306fprivate\u3067\u3059\u3002
 OpenIDE-Module-Name=Javac\u5b9f\u88c5\u30e9\u30c3\u30d1\u30fc
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-springframework/org-netbeans-libs-springframework/org/netbeans/libs/springframework/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-springframework/org-netbeans-libs-springframework/org/netbeans/libs/springframework/Bundle_ja.properties
index 0c3c407..e7cd25e 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-springframework/org-netbeans-libs-springframework/org/netbeans/libs/springframework/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-libs-springframework/org-netbeans-libs-springframework/org/netbeans/libs/springframework/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Spring Framework\u306e\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-debugger-jpda-ui/org-netbeans-spi-debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-debugger-jpda-ui/org-netbeans-spi-debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/spi/Bundle_ja.properties
index 8105db4..6883afc 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-debugger-jpda-ui/org-netbeans-spi-debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-debugger-jpda-ui/org-netbeans-spi-debugger-jpda-ui/org/netbeans/modules/debugger/jpda/ui/spi/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JPDA\u30c7\u30d0\u30c3\u30acUI SPI
 OpenIDE-Module-Display-Category=\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/jackpot/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/jackpot/spi/Bundle_ja.properties
index afc16cb..706e9e6 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/jackpot/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/jackpot/spi/Bundle_ja.properties
@@ -1,43 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2008-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2008-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_UpdateDependencyQuestion=\u30e2\u30b8\u30e5\u30fc\u30eb{0}\u3078\u306e\u4f9d\u5b58\u6027\u3092\u4ed5\u69d8\u30d0\u30fc\u30b8\u30e7\u30f3{1}\u306b\u66f4\u65b0\u3057\u307e\u3059\u304b?
 
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/spiimpl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/spiimpl/Bundle_ja.properties
index 00e56eb..31d9863 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/spiimpl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/spiimpl/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java\u30d2\u30f3\u30c8SPI
 
 #refresh hints
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/spiimpl/processor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/spiimpl/processor/Bundle_ja.properties
index 9e3e9f2..6659fff 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/spiimpl/processor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/modules/java/hints/spiimpl/processor/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java\u30d2\u30f3\u30c8\u6ce8\u91c8\u30d7\u30ed\u30bb\u30c3\u30b5
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Short-Description=Java\u30d2\u30f3\u30c8\u6ce8\u91c8\u30d7\u30ed\u30bb\u30c3\u30b5
diff --git a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/spi/java/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/spi/java/hints/Bundle_ja.properties
index 3bb180c..65087b0 100755
--- a/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/spi/java/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/org-netbeans-spi-java-hints/org-netbeans-spi-java-hints/org/netbeans/spi/java/hints/Bundle_ja.properties
@@ -1,42 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DN_Inspect=\u691c\u67fb\u306e\u5b9f\u884c...
 DN_InspectAndTransform=\u691c\u67fb\u3068\u5909\u63db\u306e\u5b9f\u884c...
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 #{0}: hint/suggestion name
 FIX_DisableHint="{0}"\u306e\u30d2\u30f3\u30c8\u3092\u7121\u52b9\u5316
 FIX_ConfigureHint="{0}"\u306e\u30d2\u30f3\u30c8\u3092\u69cb\u6210
diff --git a/netbeans-l10n-zip/src/ja/java/performance-java/performance-java/org/netbeans/modules/performance/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/performance-java/performance-java/org/netbeans/modules/performance/java/Bundle_ja.properties
index 8cb5e19..cc40834 100755
--- a/netbeans-l10n-zip/src/ja/java/performance-java/performance-java/org/netbeans/modules/performance/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/performance-java/performance-java/org/netbeans/modules/performance/java/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9Java\u30c6\u30b9\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/performance/performance/org/netbeans/modules/performance/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/performance/performance/org/netbeans/modules/performance/resources/Bundle_ja.properties
index 1610405..4c988d5 100755
--- a/netbeans-l10n-zip/src/ja/java/performance/performance/org/netbeans/modules/performance/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/performance/performance/org/netbeans/modules/performance/resources/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u30fb\u30c6\u30b9\u30c8\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
 
diff --git a/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/Bundle_ja.properties
index 791ff98..feb30b6 100755
--- a/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ### Resource bundle for package org.netbeans.modules.projectimport.eclipse.core
 
diff --git a/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/resources/Bundle_ja.properties
index c72f531..aca27a8 100755
--- a/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=Eclipse\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30a4\u30f3\u30dd\u30fc\u30c8\u6a5f\u80fd\u306b\u3088\u308a\u3001Eclipse IDE\u304b\u3089NetBeans IDE\u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002Eclipse IDE\u306eversions 3.0\u4ee5\u4e0a\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/wizard/Bundle_ja.properties
index 7ab0781..f37aac4 100755
--- a/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-core/projectimport-eclipse-core/org/netbeans/modules/projectimport/eclipse/core/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ### Resource bundle for package org.netbeans.modules.projectimport.eclipse.wizard
 
diff --git a/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-j2se/projectimport-eclipse-j2se/org/netbeans/modules/projectimport/eclipse/j2se/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-j2se/projectimport-eclipse-j2se/org/netbeans/modules/projectimport/eclipse/j2se/Bundle_ja.properties
index f0f31a8..cb87c95 100755
--- a/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-j2se/projectimport-eclipse-j2se/org/netbeans/modules/projectimport/eclipse/j2se/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/projectimport-eclipse-j2se/projectimport-eclipse-j2se/org/netbeans/modules/projectimport/eclipse/j2se/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Eclipse J2SE\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30a4\u30f3\u30dd\u30fc\u30c8\u6a5f\u80fd
 LABEL_Java_Project=Java\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/Bundle_ja.properties
index 9b963a6..a297b1d 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_WaitScan=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u3002\u30af\u30e9\u30b9\u30d1\u30b9\u3092\u30b9\u30ad\u30e3\u30f3\u4e2d...
 TXT_ApplyingPathsTitle=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30af\u30e9\u30b9\u30d1\u30b9\u306e\u30b9\u30ad\u30e3\u30f3\u4e2d
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/callhierarchy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/callhierarchy/Bundle_ja.properties
index 6d17759..d51fa03 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/callhierarchy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/callhierarchy/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CallHierarchyAction=\u547c\u51fa\u3057\u968e\u5c64
 CTL_CallHierarchyTopComponent=Java\u547c\u51fa\u3057\u968e\u5c64
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/plugins/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/plugins/Bundle_ja.properties
index 6c8b3fc..3762bab 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/plugins/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/plugins/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BINARY_FILTER=\u30d0\u30a4\u30ca\u30ea\u30fb\u30d5\u30a3\u30eb\u30bf
 COMMENT_FILTER=\u30b3\u30e1\u30f3\u30c8\u30fb\u30d5\u30a3\u30eb\u30bf
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/resources/Bundle_ja.properties
index 787d0eb..12611a9 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/spi/Bundle_ja.properties
index d538a2a..1445a73 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/spi/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_OutOfMemory=\u3053\u306e\u30bf\u30b9\u30af\u3092\u5b8c\u4e86\u3059\u308b\u305f\u3081\u306e\u30e1\u30e2\u30ea\u30fc\u304c\u4e0d\u8db3\u3057\u3066\u3044\u307e\u3059\u3002\u30bd\u30fc\u30b9\u30fb\u30c4\u30ea\u30fc\u304c\u5927\u304d\u3059\u304e\u307e\u3059\u3002etc/netbeans.conf\u306e -J-Xmx\u306e\u5024\u3092\u5927\u304d\u304f\u3057\u3001IDE\u3092\u518d\u8d77\u52d5\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 ERR_ExceptionThrown=\u4f8b\u5916\u304c\u30b9\u30ed\u30fc\u3055\u308c\u307e\u3057\u305f: {0}\u3002var/log/messages.log\u3092\u6dfb\u4ed8\u3057\u3066refactoring/java\u30e2\u30b8\u30e5\u30fc\u30eb\u306bbug\u3092\u5831\u544a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/spi/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/spi/ui/Bundle_ja.properties
index d287be4..6c6325e 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/spi/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/spi/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_CANNOT_PERFORM={0}\u306e\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093
 
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/Bundle_ja.properties
index 2780e7d..c7056dc 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - Element Html Display Name
 DSC_IntroduceLocalExtension={0}\u306e\u30ed\u30fc\u30ab\u30eb\u62e1\u5f35\u3092\u5c0e\u5165
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/elements/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/elements/Bundle_ja.properties
index 5d5cf5e..7f06d6e 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/elements/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/elements/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_SortByName=\u540d\u524d\u306b\u3088\u308b\u30bd\u30fc\u30c8
 LBL_SortBySource=\u30bd\u30fc\u30b9\u306b\u3088\u308b\u30bd\u30fc\u30c8
 LBL_WaitNode=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/scope/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/scope/Bundle_ja.properties
index 307e2fb..231274c 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/scope/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/scope/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DLG_CustomScope=\u30ab\u30b9\u30bf\u30e0\u30fb\u30b9\u30b3\u30fc\u30d7
 LBL_AllProjects=\u958b\u3044\u3066\u3044\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/tree/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/tree/Bundle_ja.properties
index 621a261..889c880 100755
--- a/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/tree/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/refactoring-java/refactoring-java/org/netbeans/modules/refactoring/java/ui/tree/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_DefaultPackage_PDU=<\u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8>
 
diff --git a/netbeans-l10n-zip/src/ja/java/selenium2-java/selenium2-java/org/netbeans/modules/selenium2/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/selenium2-java/selenium2-java/org/netbeans/modules/selenium2/java/Bundle_ja.properties
index 3609d9d..d571300 100755
--- a/netbeans-l10n-zip/src/ja/java/selenium2-java/selenium2-java/org/netbeans/modules/selenium2/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/selenium2-java/selenium2-java/org/netbeans/modules/selenium2/java/Bundle_ja.properties
@@ -1,42 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project
 NO_SELENIUM_SUPPORT=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306b\u5bfe\u3059\u308bSelenium 2.0\u30b5\u30dd\u30fc\u30c8\u306f\u3042\u308a\u307e\u305b\u3093
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Name=Selenium 2 Java\u30b5\u30dd\u30fc\u30c8
 Selenium2_Template_Wizard_Title=Selenium 2.0\u30c6\u30b9\u30c8\u30fb\u30b1\u30fc\u30b9\u540d
diff --git a/netbeans-l10n-zip/src/ja/java/selenium2-java/selenium2-java/org/netbeans/modules/selenium2/java/SeleneseITJava_ja.html b/netbeans-l10n-zip/src/ja/java/selenium2-java/selenium2-java/org/netbeans/modules/selenium2/java/SeleneseITJava_ja.html
index cfb2362..8d4e98d 100755
--- a/netbeans-l10n-zip/src/ja/java/selenium2-java/selenium2-java/org/netbeans/modules/selenium2/java/SeleneseITJava_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/selenium2-java/selenium2-java/org/netbeans/modules/selenium2/java/SeleneseITJava_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/selenium2-maven/selenium2-maven/org/netbeans/modules/selenium2/maven/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/selenium2-maven/selenium2-maven/org/netbeans/modules/selenium2/maven/Bundle_ja.properties
index 2ba9ae6..066c8a7 100755
--- a/netbeans-l10n-zip/src/ja/java/selenium2-maven/selenium2-maven/org/netbeans/modules/selenium2/maven/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/selenium2-maven/selenium2-maven/org/netbeans/modules/selenium2/maven/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Name=Selenium 2 Maven\u30b5\u30dd\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/spellchecker-bindings-java/spellchecker-bindings-java/org/netbeans/modules/spellchecker/bindings/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spellchecker-bindings-java/spellchecker-bindings-java/org/netbeans/modules/spellchecker/bindings/resources/Bundle_ja.properties
index 213a18d..ad647f7 100755
--- a/netbeans-l10n-zip/src/ja/java/spellchecker-bindings-java/spellchecker-bindings-java/org/netbeans/modules/spellchecker/bindings/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spellchecker-bindings-java/spellchecker-bindings-java/org/netbeans/modules/spellchecker/bindings/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Name=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30abJava\u8a00\u8a9e\u30d0\u30a4\u30f3\u30c9
 OpenIDE-Module-Short-Description=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30abJava\u8a00\u8a9e\u30d0\u30a4\u30f3\u30c9
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/catalog/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/catalog/Bundle_ja.properties
index 3b0942c..b960781 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/catalog/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/catalog/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SpringCatalog=Spring Framework\u306e\u30ab\u30bf\u30ed\u30b0
 LBL_SpringCatalogDescription=Spring Framework\u306eXML\u30b9\u30ad\u30fc\u30de\u306e\u30ab\u30bf\u30ed\u30b0
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/completion/Bundle_ja.properties
index 8cb6321..ed5cced 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Unnamed=(\u540d\u524d\u306a\u3057)
 # 0 - a bean name
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/completion/completors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/completion/completors/Bundle_ja.properties
index 61ed99d..9888df0 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/completion/completors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/completion/completors/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MESG_AdditionalItems=\u30ed\u30fc\u30ab\u30eb\u9805\u76ee\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/editor/Bundle_ja.properties
index 376f830..230bcc1 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/editor/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 title.class.resolver=\u30af\u30e9\u30b9\u3092\u89e3\u6c7a\u3057\u3066\u3044\u307e\u3059
 
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/hyperlink/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/hyperlink/Bundle_ja.properties
index 1dc6336..24ea6a0 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/hyperlink/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/hyperlink/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ResourceNotFound=Spring Beans\u69cb\u6210\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 title.attribute.searching=\u5c5e\u6027\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/jumpto/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/jumpto/Bundle_ja.properties
index f43a3b4..a00cc26 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/jumpto/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/jumpto/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_SpringBeansType=Spring Bean\u306e\u5b9a\u7fa9
 DLG_GoToSpringBean=Spring Bean\u3078\u79fb\u52d5
 TXT_GoToSpringBean=Spring Bean\u3078\u79fb\u52d5(&B)...
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/loader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/loader/Bundle_ja.properties
index 76abf2a..b8cf488 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/loader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/loader/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SpringXMLConfigName=Spring XML\u69cb\u6210\u30d5\u30a1\u30a4\u30eb
 Source=\u30bd\u30fc\u30b9(&S)
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/refactoring/Bundle_ja.properties
index 07f4617..c891dc6 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Update=\u66f4\u65b0
 MSG_UpdateReference={0}\u3078\u306e\u53c2\u7167\u3092\u66f4\u65b0
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/Bundle_ja.properties
index e94e41c..be3d442 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Spring Beans
 OpenIDE-Module-Display-Category=Java SE
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/newSpringXMLConfig_ja.html b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/newSpringXMLConfig_ja.html
index 0cad531..e2d86da 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/newSpringXMLConfig_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/resources/newSpringXMLConfig_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/ui/customizer/Bundle_ja.properties
index 5a50111..021f938 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SpringFramework=Spring Framework
 LBL_ConfigFilesTitle=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/wizards/Bundle_ja.properties
index 9332b59..e7f416f 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/beans/wizards/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Namespaces_Include_Step=Spring\u540d\u524d\u7a7a\u9593
 
diff --git a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/java/Bundle_ja.properties
index 09bf19f..4980e0a 100755
--- a/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/spring-beans/spring-beans/org/netbeans/modules/spring/java/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 JavaUtils.title.class.searching=\u30af\u30e9\u30b9\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059...
 JavaUtils.title.method.searching=\u30e1\u30bd\u30c3\u30c9\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/java/testng-ant/testng-ant/org/netbeans/modules/testng/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/testng-ant/testng-ant/org/netbeans/modules/testng/ant/Bundle_ja.properties
index 625843e..f97dc78 100755
--- a/netbeans-l10n-zip/src/ja/java/testng-ant/testng-ant/org/netbeans/modules/testng/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/testng-ant/testng-ant/org/netbeans/modules/testng/ant/Bundle_ja.properties
@@ -1,50 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright \u00a9 2011-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 was 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.
-#
-# Oracle is not responsible for the availability of third-party Web sites
-# mentioned in this document. Oracle does not endorse and is not
-# responsible or liable for any content, advertising, products, or other
-# materials on or available from such sites or resources. Oracle will not be
-# responsible or liable for any damage or loss caused or alleged to be
-# caused by or in connection with use of or reliance on any such content,
-# goods, or services available on or through any such sites or resources.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Long-Description=TestNG\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3092Ant\u30d9\u30fc\u30b9\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u7d71\u5408\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Ant TestNG\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/testng-maven/testng-maven/org/netbeans/modules/testng/maven/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/testng-maven/testng-maven/org/netbeans/modules/testng/maven/Bundle_ja.properties
index a45352d..7a3ea19 100755
--- a/netbeans-l10n-zip/src/ja/java/testng-maven/testng-maven/org/netbeans/modules/testng/maven/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/testng-maven/testng-maven/org/netbeans/modules/testng/maven/Bundle_ja.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright \u00a9 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2006-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Name=Maven TestNG\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/Bundle_ja.properties
index 5485903..a0563c5 100755
--- a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=TesNG\u30b5\u30dd\u30fc\u30c8UI
 
 LBL_GotoSource=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/actions/Bundle_ja.properties
index 00d1534..8daf522 100755
--- a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_DebugSuiteAction=\u30c6\u30b9\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u30c7\u30d0\u30c3\u30b0(&D)
 CTL_DebugTestClassAction=\u30c6\u30b9\u30c8\u30fb\u30af\u30e9\u30b9\u3092\u30c7\u30d0\u30c3\u30b0
 CTL_DebugTestMethodAction=\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/resources/newTestSuite_ja.html b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/resources/newTestSuite_ja.html
index b49d0b9..a7ba6b0 100755
--- a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/resources/newTestSuite_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/resources/newTestSuite_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/resources/newTest_ja.html b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/resources/newTest_ja.html
index de0a785..7a64ce2 100755
--- a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/resources/newTest_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/resources/newTest_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright © 1997-2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 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>
diff --git a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/wizards/Bundle_ja.properties
index 471b314..458c6c5 100755
--- a/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/testng-ui/testng-ui/org/netbeans/modules/testng/ui/wizards/Bundle_ja.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright \u00a9 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2006-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9(&S)
 EmptyTestNGTest_displayName=TestNG\u30c6\u30b9\u30c8\u30fb\u30b1\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/java/testng/testng/org/netbeans/modules/testng/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/testng/testng/org/netbeans/modules/testng/Bundle_ja.properties
index 8738615..eabd11d 100755
--- a/netbeans-l10n-zip/src/ja/java/testng/testng/org/netbeans/modules/testng/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/testng/testng/org/netbeans/modules/testng/Bundle_ja.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright \u00a9 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2006-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AND=\ \u304a\u3088\u3073 
 
diff --git a/netbeans-l10n-zip/src/ja/java/websvc-jaxws21/websvc-jaxws21/org/netbeans/modules/websvc/jaxws21/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/websvc-jaxws21/websvc-jaxws21/org/netbeans/modules/websvc/jaxws21/Bundle_ja.properties
index e1ed786..64c3328 100755
--- a/netbeans-l10n-zip/src/ja/java/websvc-jaxws21/websvc-jaxws21/org/netbeans/modules/websvc/jaxws21/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/websvc-jaxws21/websvc-jaxws21/org/netbeans/modules/websvc/jaxws21/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module descritpion
 OpenIDE-Module-Name=JAX-WS 2.2\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/java/websvc-jaxws21api/websvc-jaxws21api/org/netbeans/modules/websvc/jaxws21api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/websvc-jaxws21api/websvc-jaxws21api/org/netbeans/modules/websvc/jaxws21api/Bundle_ja.properties
index dfc984a..e8a9fc1 100755
--- a/netbeans-l10n-zip/src/ja/java/websvc-jaxws21api/websvc-jaxws21api/org/netbeans/modules/websvc/jaxws21api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/websvc-jaxws21api/websvc-jaxws21api/org/netbeans/modules/websvc/jaxws21api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module descritpion
 OpenIDE-Module-Name=JAX-WS API
diff --git a/netbeans-l10n-zip/src/ja/java/websvc-saas-codegen-java/websvc-saas-codegen-java/org/netbeans/modules/websvc/saas/codegen/java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/websvc-saas-codegen-java/websvc-saas-codegen-java/org/netbeans/modules/websvc/saas/codegen/java/Bundle_ja.properties
index 4251ce8..75dbe14 100755
--- a/netbeans-l10n-zip/src/ja/java/websvc-saas-codegen-java/websvc-saas-codegen-java/org/netbeans/modules/websvc/saas/codegen/java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/websvc-saas-codegen-java/websvc-saas-codegen-java/org/netbeans/modules/websvc/saas/codegen/java/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Name=Java\u7528SaaS\u30b5\u30fc\u30d3\u30b9\u30fb\u30b3\u30fc\u30c9\u751f\u6210
diff --git a/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/modules/whitelist/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/modules/whitelist/Bundle_ja.properties
index f514e25..28d690b 100755
--- a/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/modules/whitelist/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/modules/whitelist/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Name=\u30db\u30ef\u30a4\u30c8\u30fb\u30ea\u30b9\u30c8\u306e\u30b5\u30dd\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/modules/whitelist/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/modules/whitelist/project/Bundle_ja.properties
index d0a37c6..e8cf1ee 100755
--- a/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/modules/whitelist/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/modules/whitelist/project/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 WhiteListCategoryPanel.jLabel1.text=\u30a2\u30af\u30c6\u30a3\u30d6\u306a\u30db\u30ef\u30a4\u30c8\u30fb\u30ea\u30b9\u30c8:
 LBL_CategoryWhitelist=\u30db\u30ef\u30a4\u30c8\u30fb\u30ea\u30b9\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/spi/whitelist/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/spi/whitelist/support/Bundle_ja.properties
index 858454e..c7f0563 100755
--- a/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/spi/whitelist/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/whitelist/whitelist/org/netbeans/spi/whitelist/support/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DESC_Class=\u578b{0}\u306e\u30a2\u30af\u30bb\u30b9\u306f{1}\u306b\u3088\u3063\u3066\u7981\u6b62\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 DESC_Cons=\u30b3\u30f3\u30b9\u30c8\u30e9\u30af\u30bf{0}\u306e\u547c\u51fa\u3057\u306f{1}\u306b\u3088\u3063\u3066\u7981\u6b62\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 DESC_Meth=\u30e1\u30bd\u30c3\u30c9{0}\u306e\u547c\u51fa\u3057\u306f{1}\u306b\u3088\u3063\u3066\u7981\u6b62\u3055\u308c\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/Bundle_ja.properties
index ef82a70..80b973c 100755
--- a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=XML
 OpenIDE-Module-Name=JAXB\u30a6\u30a3\u30b6\u30fc\u30c9
 OpenIDE-Module-Long-Description=Java XML\u7d50\u5408\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u3068\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/actions/Bundle_ja.properties
index a4ad868..c823a07 100755
--- a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/actions/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_JAXBMarshalCodeGenerationAction=JAXB\u30de\u30fc\u30b7\u30e3\u30ea\u30f3\u30b0
 CTL_JAXBUnMarshalCodeGenerationAction=JAXB\u30a2\u30f3\u30de\u30fc\u30b7\u30e3\u30ea\u30f3\u30b0
 CTL_OpenJAXBWizard=JAXB\u30a6\u30a3\u30b6\u30fc\u30c9\u3092\u958b\u304f
diff --git a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/resources/JAXBWiz_ja.html b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/resources/JAXBWiz_ja.html
index df39b40..8a42d8b 100755
--- a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/resources/JAXBWiz_ja.html
+++ b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/resources/JAXBWiz_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/ui/Bundle_ja.properties
index 946e28c..ed8509a 100755
--- a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/ui/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Labels
 LBL_JAXBWizTitle=XML\u7d50\u5408\u306e\u69cb\u6210
 LBL_XSDFileLoc=XSD\u30d5\u30a1\u30a4\u30eb\u306e\u5834\u6240:
diff --git a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/util/Bundle_ja.properties
index 851bd4e..d00fa56 100755
--- a/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/xml-jaxb/xml-jaxb/org/netbeans/modules/xml/jaxb/util/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_JAXB_PROGRESS=JAXB\u30a6\u30a3\u30b6\u30fc\u30c9\u306e\u9032\u6357
 MSG_ERROR_COMPILING=\u30b9\u30ad\u30fc\u30de\u306e\u30b3\u30f3\u30d1\u30a4\u30eb\u4e2d\u306e\u30a8\u30e9\u30fc
 WARN_couldNotEnableCoS=\u300c\u4fdd\u5b58\u6642\u306b\u30b3\u30f3\u30d1\u30a4\u30eb\u300d\u3092\u81ea\u52d5\u7684\u306b\u6709\u52b9\u5316\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f(Ant\u30d9\u30fc\u30b9\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u306e\u307f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u3059)\u3002
diff --git a/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/actions/Bundle_ja.properties
index c0a0aeb..a9fd790 100755
--- a/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/generator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/generator/Bundle_ja.properties
index 37ddef7..25412cd 100755
--- a/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/generator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/generator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## ElementBindings.java
 DELIMITER_HANDLING=\u30b3\u30f3\u30c6\u30ca
diff --git a/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/resources/Bundle_ja.properties
index 5161ebc..9d459de 100755
--- a/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/java/xml-tools-java/xml-tools-java/org/netbeans/modules/xml/tools/java/resources/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ## xml/tools/java/manifest.mf
 OpenIDE-Module-Name=XML\u30c4\u30fc\u30ebJava\u62e1\u5f35
 OpenIDE-Module-Display-Category=Java
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-apdu-io/javacard-apdu-io/org/netbeans/modules/javacard/apdu/io/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-apdu-io/javacard-apdu-io/org/netbeans/modules/javacard/apdu/io/Bundle_ja.properties
index f140ba1..9b0da7f 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-apdu-io/javacard-apdu-io/org/netbeans/modules/javacard/apdu/io/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-apdu-io/javacard-apdu-io/org/netbeans/modules/javacard/apdu/io/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=APDU\u30d7\u30ed\u30c8\u30b3\u30eb\u3092\u4f7f\u7528\u3057\u3066Java Card(tm)\u30c7\u30d0\u30a4\u30b9\u3068\u5bfe\u8a71\u3059\u308b\u305f\u3081\u306e\u5165\u51fa\u529b\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fb\u30af\u30e9\u30b9\u3092\u63d0\u4f9b\u3057\u307e\u3059
 OpenIDE-Module-Name=Java Card APDU\u5165\u51fa\u529b\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-apdufile/javacard-apdufile/org/netbeans/modules/javacard/apdufile/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-apdufile/javacard-apdufile/org/netbeans/modules/javacard/apdufile/Bundle_ja.properties
index c9763a9..a7355dc 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-apdufile/javacard-apdufile/org/netbeans/modules/javacard/apdufile/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-apdufile/javacard-apdufile/org/netbeans/modules/javacard/apdufile/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_Apdu_loader_name=Apdu\u30d5\u30a1\u30a4\u30eb
 
 OpenIDE-Module-Long-Description=Java Card APDU\u30b9\u30af\u30ea\u30d7\u30c8(.scr)\u30d5\u30a1\u30a4\u30eb\u306e\u30a8\u30c7\u30a3\u30bf\u30fb\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-common/javacard-common/org/netbeans/modules/javacard/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-common/javacard-common/org/netbeans/modules/javacard/common/Bundle_ja.properties
index 009050b..9b52e85 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-common/javacard-common/org/netbeans/modules/javacard/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-common/javacard-common/org/netbeans/modules/javacard/common/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=\u3044\u304f\u3064\u304b\u306eJava Card\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u5171\u901a\u306e\u30b3\u30fc\u30c9\u3092\u63d0\u4f9b\u3057\u307e\u3059
 OpenIDE-Module-Name=Java Card\u5171\u901a
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/console/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/console/Bundle_ja.properties
index 9898866..0dcaa35 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/console/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/console/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=\u5b9f\u884c\u4e2d\u306eJava Card\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3068\u30e9\u30a4\u30d6\u3067\u5bfe\u8a71\u3059\u308b\u305f\u3081\u306e\u30b3\u30f3\u30bd\u30fc\u30eb\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\u3057\u305f\u304c\u3063\u3066\u3001\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u5b9f\u884c\u305b\u305a\u306b\u30c7\u30fc\u30bf\u3092\u9001\u53d7\u4fe1\u3067\u304d\u307e\u3059\u3002
 OpenIDE-Module-Name=Java Card\u30b3\u30f3\u30bd\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/shell/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/shell/Bundle_ja.properties
index 7b448eb..db2c9b8 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/shell/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-console/javacard-console/org/netbeans/modules/javacard/shell/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_ShellAction=\u30b7\u30a7\u30eb
 
 CTL_ShellTopComponent=\u30b7\u30a7\u30eb\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-filemodels/javacard-filemodels/com/sun/javacard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-filemodels/javacard-filemodels/com/sun/javacard/Bundle_ja.properties
index 36d574a..28f04ef 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-filemodels/javacard-filemodels/com/sun/javacard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-filemodels/javacard-filemodels/com/sun/javacard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_BAD_FILE={0}\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3001\u901a\u5e38\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093
 NO_INSTANCES=\u3053\u306e\u30a2\u30d7\u30ec\u30c3\u30c8\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306f\u4f5c\u6210\u3055\u308c\u307e\u305b\u3093
 ONE_INSTANCE=\u3053\u306e\u30a2\u30d7\u30ec\u30c3\u30c8\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306f1\u3064\u4f5c\u6210\u3055\u308c\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-filemodels/javacard-filemodels/org/netbeans/modules/javacard/filemodels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-filemodels/javacard-filemodels/org/netbeans/modules/javacard/filemodels/Bundle_ja.properties
index e43549e..2c56786 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-filemodels/javacard-filemodels/org/netbeans/modules/javacard/filemodels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-filemodels/javacard-filemodels/org/netbeans/modules/javacard/filemodels/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=Java Card\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4e00\u90e8\u3067\u3042\u308b\u3001\u3055\u307e\u3056\u307e\u306a\u30d5\u30a1\u30a4\u30eb\u30fb\u30bf\u30a4\u30d7\u306eJava\u30e2\u30c7\u30eb\u30fb\u30af\u30e9\u30b9\u3002\u3053\u306e\u30e9\u30a4\u30d6\u30e9\u30ea\u306f\u3001NetBeans Java Card\u30e2\u30b8\u30e5\u30fc\u30eb\u3067\u4f7f\u7528\u3055\u308c\u308b\u307b\u304b\u3001Java Card\u53c2\u7167\u5b9f\u88c5\u306e\u4e00\u90e8\u3067\u3042\u308bAnt\u30bf\u30b9\u30af\u3067\u3082\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002
 OpenIDE-Module-Name=Java Card\u30d5\u30a1\u30a4\u30eb\u30fb\u30e2\u30c7\u30eb
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-kit/javacard-kit/org/netbeans/modules/javacard/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-kit/javacard-kit/org/netbeans/modules/javacard/kit/Bundle_ja.properties
index 58fb060..1a6a6d4 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-kit/javacard-kit/org/netbeans/modules/javacard/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-kit/javacard-kit/org/netbeans/modules/javacard/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java Card(TM)
 OpenIDE-Module-Long-Description=Java Card\u30c6\u30af\u30ce\u30ed\u30b8\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30bf\u30a4\u30d7\u304a\u3088\u3073\u5b8c\u5168\u306a\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-oberthur/javacard-oberthur/org/netbeans/modules/javacard/oberthur/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-oberthur/javacard-oberthur/org/netbeans/modules/javacard/oberthur/Bundle_ja.properties
index 91e3171..682da7d 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-oberthur/javacard-oberthur/org/netbeans/modules/javacard/oberthur/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-oberthur/javacard-oberthur/org/netbeans/modules/javacard/oberthur/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=NetBeans Java Card\u30e2\u30b8\u30e5\u30fc\u30eb\u3067Oberthur\u30b9\u30de\u30fc\u30c8\u30fb\u30ab\u30fc\u30c9SDK\u3092Java Card\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3068\u3057\u3066\u8a8d\u8b58\u3067\u304d\u308b\u3088\u3046\u306b\u3057\u3001Java Card\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092Oberthur\u30c7\u30d0\u30a4\u30b9\u306b\u30c7\u30d7\u30ed\u30a4\u3067\u304d\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Oberthur Java Card\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-platform-ui/javacard-platform-ui/org/netbeans/modules/javacard/platform/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-platform-ui/javacard-platform-ui/org/netbeans/modules/javacard/platform/ui/Bundle_ja.properties
index e308e37..7efa88e 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-platform-ui/javacard-platform-ui/org/netbeans/modules/javacard/platform/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-platform-ui/javacard-platform-ui/org/netbeans/modules/javacard/platform/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=Java Card\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u30b5\u30fc\u30d3\u30b9UI
 OpenIDE-Module-Name=Java Card\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0UI
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/Bundle_ja.properties
index 9bcbe17..3bd2f5d 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=Java Card version 3\u4ee5\u964d\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30bf\u30a4\u30d7\u304a\u3088\u3073\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30fb\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Name=Java Card\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/options/Bundle_ja.properties
index a3666ca..88c2fca 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 AdvancedOption_DisplayName_javacard=Java Card
 AdvancedOption_Keywords_javacard=Java\u3001\u30ab\u30fc\u30c9\u3001JavaCard\u3001SmartCard\u3001\u30b9\u30de\u30fc\u30c8
 AdvancedOption_Tooltip_javacard=Java Card\u306e\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/Bundle_ja.properties
index abbd19a..85ec11e 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_No_Build_XML_Found=\u30d3\u30eb\u30c9XML\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
 LBL_IMPORTANT_FILES=\u91cd\u8981\u306a\u30d5\u30a1\u30a4\u30eb
 LBL_Properties_Action=\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/customizer/Bundle_ja.properties
index 4c314d3..9099bf1 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/customizer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 PackagingCustomizer.aIDPanel1.title=\u30af\u30e9\u30b7\u30c3\u30af\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8AID
 
 CapProjectCustomizerDependencies.jLabel1.text=\u4f9d\u5b58\u6027
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/Bundle_ja.properties
index a9f2b71..d35a52f 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ORIGIN=\u30d1\u30b9
 SOURCES_PATH=\u30bd\u30fc\u30b9\u30fb\u30d1\u30b9
 EXP_FILE=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/ui/Bundle_ja.properties
index bb989bd..8a7fcac 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/deps/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 Sig#DependenciesChildren
 MSG_REMOVING_DEPENDENCY=\u4f9d\u5b58\u6027{0}\u3092\u524a\u9664\u3057\u3066\u3044\u307e\u3059
 
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/refactoring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/refactoring/Bundle_ja.properties
index e2a5c89..a8c12ab 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/refactoring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/refactoring/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 Update_web_xml=web.xml\u306e{0}\u306b\u5bfe\u3059\u308b\u53c2\u7167\u3092\u66f4\u65b0
 Update_applet_xml=applet.xml\u306e{0}\u306b\u5bfe\u3059\u308b\u53c2\u7167\u3092\u66f4\u65b0
 Update_jc_specific_descriptor=javacard.xml\u306e{0}\u306b\u5bfe\u3059\u308b\u53c2\u7167\u3092\u66f4\u65b0
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/ui/Bundle_ja.properties
index bb67ca2..d017a79 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/project/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CLASSIC_LIBRARY_PROJECT=ClassicLibrary
 EXTENSION_LIBRARY_PROJECT=ExtensionLibrary
 Get_Sources_From_=\u304b\u3089\u30bd\u30fc\u30b9\u3092\u53d6\u5f97...
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/CapProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/CapProjectDescription_ja.html
index 5a252ef..52281c9 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/CapProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/CapProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/ClsLibProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/ClsLibProjectDescription_ja.html
index 105e63d..93ad690 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/ClsLibProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/ClsLibProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/EapProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/EapProjectDescription_ja.html
index 64a1612..149a646 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/EapProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/EapProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/ExtLibProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/ExtLibProjectDescription_ja.html
index ecb9c99..113e24a 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/ExtLibProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/ExtLibProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/WebProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/WebProjectDescription_ja.html
index da65f9f..b283ab9 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/WebProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/resources/WebProjectDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/source/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/source/Bundle_ja.properties
index 031ced1..4ecd6e0 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/source/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/source/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DOUBLE=\u500d\u7cbe\u5ea6\u6d6e\u52d5\u5c0f\u6570\u70b9\u5024
 FLOAT=\u6d6e\u52d5\u5c0f\u6570\u70b9\u5024
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/Bundle_ja.properties
index f380678..8da23ab 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 Templates/javacard/Servlet.java=Java Card\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8
 Templates/javacard/ExtendedApplet.java=\u62e1\u5f35\u30a2\u30d7\u30ec\u30c3\u30c8
 Templates/javacard/ClassicApplet.java=\u30af\u30e9\u30b7\u30c3\u30af\u30fb\u30a2\u30d7\u30ec\u30c3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ClassicAppletDescription_ja.html b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ClassicAppletDescription_ja.html
index f220abf..58b04e7 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ClassicAppletDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ClassicAppletDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ExtendedAppletDescription_ja.html b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ExtendedAppletDescription_ja.html
index e47662d..9dd6523 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ExtendedAppletDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ExtendedAppletDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ServletDescription_ja.html b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ServletDescription_ja.html
index bc3c991..d922da3 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ServletDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/ServletDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/web-index_ja.html b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/web-index_ja.html
index b5cbd38..8feec38 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/web-index_ja.html
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/templates/web-index_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/wizard/Bundle_ja.properties
index 2232c66..e49ed80 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-project/javacard-project/org/netbeans/modules/javacard/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PackageAIDPanel.aIDPanel1.title=\u30af\u30e9\u30b7\u30c3\u30af\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8AID
 PackageAIDPanel.jTextArea1.text=\u30af\u30e9\u30b7\u30c3\u30af\u30fb\u30d1\u30c3\u30b1\u30fc\u30b8AID\u306f\u3001\u3053\u306e\u30af\u30e9\u30b7\u30c3\u30af\u30fb\u30a2\u30d7\u30ec\u30c3\u30c8\u307e\u305f\u306f\u30af\u30e9\u30b7\u30c3\u30af\u30fb\u30e9\u30a4\u30d6\u30e9\u30eaJAR\u306e\u30d1\u30c3\u30b1\u30fc\u30b8\u3092\u8868\u3059\u4e00\u610f\u306eID\u3067\u3059(\u305d\u306e\u3088\u3046\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u542b\u307e\u308c\u308b\u30d1\u30c3\u30b1\u30fc\u30b8\u306f1\u3064\u3060\u3051\u3067\u3059)\u3002\n\nRID\u90e8\u5206\u306f\u3001ISO (\u56fd\u969b\u6a19\u6e96\u5316\u6a5f\u69cb)\u306a\u3069\u306e\u6a19\u6e96\u5316\u56e3\u4f53\u304b\u3089\u30e6\u30fc\u30b6\u30fc\u306e\u7d44\u7e54\u306b\u5272\u5f53\u3066\u3089\u308c\u308b\u4e00\u610f\u306eID\u3067\u3059\u3002\u300c\u30c4\u30fc\u30eb\u300d>\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d>\u300c\u305d\u306e\u4ed6\u300d>\u300cJava Card\u300d\u3067\u3001\u3059\u3079\u3066\u306e\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u5bfe\u3057\u3066\u8a2d\u5b9a\u3067\u304d\u307e\u3059\u3002\n\nPIX (\u6240\u6709\u8005\u8b58\u5225\u5b50)\u306f\u30011\u3064\u306eJava\u30d1\u30c3\u30b1\u30fc\u30b8\u3092\u4e00\u610f\u306b\u8b58\u5225\u3057\u307e\u3059\u3002\u3053\u308c\u306fIDE\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u3001\u4efb\u610f\u306e\u5024\u306b\u8a2d\u5b9a\u3067\u304d\u307e\u3059\u3002\u958b\u767a\u76ee\u7684\u306e\u5834\u5408\u3001\u7279\u5b9a\u306e\u5024\u306f\u5fc5\u8981\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-bundle/javacard-ri-bundle/org/netbeans/modules/javacard/ri/bundle/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-bundle/javacard-ri-bundle/org/netbeans/modules/javacard/ri/bundle/Bundle_ja.properties
index 26e4bb5..2919a92 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-bundle/javacard-ri-bundle/org/netbeans/modules/javacard/ri/bundle/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-bundle/javacard-ri-bundle/org/netbeans/modules/javacard/ri/bundle/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=Java Card\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u958b\u767a\u7528\u306eJava Card 3.0.2\u53c2\u7167\u5b9f\u88c5\u306e\u7d44\u8fbc\u307f\u30b3\u30d4\u30fc\u3092\u63d0\u4f9b\u3057\u307e\u3059
 OpenIDE-Module-Name=Java Card\u30e9\u30f3\u30bf\u30a4\u30e0\u30fb\u30d0\u30f3\u30c9\u30eb
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-bundle/netbeans/JCDK3.0.2_ConnectedEdition/lib/nbutils/com/sun/javacard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-bundle/netbeans/JCDK3.0.2_ConnectedEdition/lib/nbutils/com/sun/javacard/Bundle_ja.properties
index 0edead0..5c8f752 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-bundle/netbeans/JCDK3.0.2_ConnectedEdition/lib/nbutils/com/sun/javacard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-bundle/netbeans/JCDK3.0.2_ConnectedEdition/lib/nbutils/com/sun/javacard/Bundle_ja.properties
@@ -1,41 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_BAD_FILE={0}\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3001\u901a\u5e38\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093
 NO_INSTANCES=\u3053\u306e\u30a2\u30d7\u30ec\u30c3\u30c8\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306f\u4f5c\u6210\u3055\u308c\u307e\u305b\u3093
 ONE_INSTANCE=\u3053\u306e\u30a2\u30d7\u30ec\u30c3\u30c8\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306f1\u3064\u4f5c\u6210\u3055\u308c\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/card/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/card/Bundle_ja.properties
index 17e385f..af6254f 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/card/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/card/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_DONE_WITH_EXIT_CODE={0}\u306f\u7d42\u4e86\u30b3\u30fc\u30c9{1}\u3067\u7d42\u4e86\u3057\u307e\u3057\u305f
 DEBUG_TAB_NAME={0} (\u30c7\u30d0\u30c3\u30b0)
 MSG_DEBUG_DONE_WITH_EXIT_CODE={0} (\u30c7\u30d0\u30c3\u30b0)\u306f\u7d42\u4e86\u30b3\u30fc\u30c9{1}\u3067\u7d42\u4e86\u3057\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/Bundle_ja.properties
index 9e7bc90..c894bdf 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=\u300c\u30c4\u30fc\u30eb\u300d>\u300cJava\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u300d\u3067Java Card\u53c2\u7167\u5b9f\u88c5\u3092Java\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3068\u3057\u3066\u8a2d\u5b9a\u3057\u3001\u305d\u308c\u3092Java Card\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u4f7f\u7528\u3067\u304d\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Java Card RI\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/installer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/installer/Bundle_ja.properties
index 6696a43..b58b7f5 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/installer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/installer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 SUN_MICROSYSTEMS=Sun Microsystems
 JAVACARD_INSTALLATION=Java Card\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
 UNKNOWN_VENDOR=[\u4e0d\u660e\u306a\u30d9\u30f3\u30c0\u30fc]
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/loader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/loader/Bundle_ja.properties
index de7cfd8..839e427 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/loader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-ri-platform/javacard-ri-platform/org/netbeans/modules/javacard/ri/platform/loader/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_JavacardPlatform_loader_name=JavacardPlatform\u30d5\u30a1\u30a4\u30eb
 PlatformCustomizerPanel.devicesPanel.TabConstraints.tabTitle=\u30c7\u30d0\u30a4\u30b9
 PlatformCustomizerPanel.classpathPanel.TabConstraints.tabTitle=\u62e1\u5f35\u30af\u30e9\u30b9\u30d1\u30b9
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/api/Bundle_ja.properties
index 374c344..cde9ade 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_MANAGE_DEVICES=\u30ab\u30fc\u30c9\u306e\u7ba1\u7406(&M)
 LBL_DEVICES=\u30ab\u30fc\u30c9(&C)
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/Bundle_ja.properties
index 0f53980..4d7110a 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=Java Card\u30e9\u30f3\u30bf\u30a4\u30e0\u3092\u7d71\u5408\u3059\u308b\u305f\u3081\u306eAPI
 OpenIDE-Module-Name=Java Card SPI
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/actions/Bundle_ja.properties
index a62f816..f4f9c8d 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACTION_START_CARD=\u958b\u59cb
 ACTION_STOP_CARD=\u505c\u6b62
diff --git a/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/impl/Bundle_ja.properties
index 76ac7ec..e0b6626 100755
--- a/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/javacard-spi/javacard-spi/org/netbeans/modules/javacard/spi/impl/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_MANAGE_DEVICES=\u30ab\u30fc\u30c9\u306e\u7ba1\u7406(&M)
 LBL_DEVICES=\u30ab\u30fc\u30c9(&C)
diff --git a/netbeans-l10n-zip/src/ja/javacard/properties-based-dataobjects/properties-based-dataobjects/org/netbeans/modules/propdos/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/properties-based-dataobjects/properties-based-dataobjects/org/netbeans/modules/propdos/Bundle_ja.properties
index 42c662d..45dcf14 100755
--- a/netbeans-l10n-zip/src/ja/javacard/properties-based-dataobjects/properties-based-dataobjects/org/netbeans/modules/propdos/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/properties-based-dataobjects/properties-based-dataobjects/org/netbeans/modules/propdos/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u30d7\u30ed\u30d1\u30c6\u30a3\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u89e3\u6790\u3057\u3066\u4f55\u3089\u304b\u306e\u578b\u6307\u5b9a\u3055\u308c\u305f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306b\u3059\u308bDataObject\u3092\u8a18\u8ff0\u3059\u308b\u305f\u3081\u306e\u30b5\u30dd\u30fc\u30c8\u3002\u5358\u306bPropertiesBasedDataObject<T>\u3092\u30b5\u30d6\u30af\u30e9\u30b9\u5316\u3057\u3001create(T)\u3092\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30d7\u30ed\u30d1\u30c6\u30a3\u30fb\u30d9\u30fc\u30b9\u306e\u30c7\u30fc\u30bf\u30fb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/javacard/simple-project-templates/simple-project-templates/org/netbeans/modules/projecttemplates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/simple-project-templates/simple-project-templates/org/netbeans/modules/projecttemplates/Bundle_ja.properties
index 8cc305c..3264390 100755
--- a/netbeans-l10n-zip/src/ja/javacard/simple-project-templates/simple-project-templates/org/netbeans/modules/projecttemplates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/simple-project-templates/simple-project-templates/org/netbeans/modules/projecttemplates/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java
 OpenIDE-Module-Long-Description=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u5168\u4f53\u3092\u5358\u4e00\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u30fb\u30d5\u30a1\u30a4\u30eb\u306b\u5b9a\u7fa9\u3067\u304d\u308b\u3088\u3046\u306b\u3057\u307e\u3059
 OpenIDE-Module-Name=\u5358\u7d14\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/javacard/swing-customizerlayout/swing-customizerlayout/org/netbeans/swing/layouts/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javacard/swing-customizerlayout/swing-customizerlayout/org/netbeans/swing/layouts/Bundle_ja.properties
index b24fc2f..f85192b 100755
--- a/netbeans-l10n-zip/src/ja/javacard/swing-customizerlayout/swing-customizerlayout/org/netbeans/swing/layouts/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javacard/swing-customizerlayout/swing-customizerlayout/org/netbeans/swing/layouts/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u5165\u308c\u5b50\u306b\u306a\u3063\u305f\u30d1\u30cd\u30eb\u306e\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u63c3\u3048\u308b\u305f\u3081\u306e\u30ec\u30a4\u30a2\u30a6\u30c8\u30fb\u30de\u30cd\u30fc\u30b8\u30e3\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\u89aa\u30d1\u30cd\u30eb\u306fLayoutData\u3092\u5b9f\u88c5\u3057\u3001\u4f4d\u7f6e\u60c5\u5831\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\u5b50\u30d1\u30cd\u30eb(\u901a\u5e38\u306f\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u884c\u30921\u3064\u3060\u3051\u542b\u3080)\u306fLDPLayout\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002LDPLayout\u306f\u3053\u306e\u30c7\u30fc\u30bf\u3092\u4f7f\u7528\u3057\u3066\u3001\u3059\u3079\u3066\u306e\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306eX\u4f4d\u7f6e\u3092\u4e00\u81f4\u3055\u305b\u307e\u3059\u3002<p>\u3053\u308c\u306f\u3001\u5b50\u30d1\u30cd\u30eb\u304c\u8ffd\u52a0\u3055\u308c\u305f\u5834\u5408\u306b\u89aa\u30d1\u30cd\u30eb\u304c\u305d\u306e\u5b50\u30d1\u30cd\u30eb\u3092\u8a8d\u8b58\u3067\u304d\u306a\u3044\u30ab\u30b9\u30bf\u30de\u30a4\u30b6\u3067\u5f79\u7acb\u3061\u3001\u95a2\u9023\u306e\u306a\u3044\u4e00\u9023\u306e\u30d1\u30cd\u30eb\u3092\u30e9\u30f3\u30c0\u30e0\u306b\u5bc4\u305b\u96c6\u3081\u305f\u3088\u3046\u306a\u5916\u89b3\u3067\u306f\u306a\u304f\u3001\u300c\u30c7\u30b6\u30a4\u30f3\u3055\u308c\u305f\u300d\u3088\u3046\u306a\u7d50\u679c\u3092\u5f97\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
 OpenIDE-Module-Name=\u5165\u308c\u5b50\u30d1\u30cd\u30eb\u30fb\u30ec\u30a4\u30a2\u30a6\u30c8\u30fb\u30de\u30cd\u30fc\u30b8\u30e3
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/Bundle_ja.properties
index 9900d8c..a7299c7 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - file system display name
 
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/actions/Bundle_ja.properties
index d87582a..7d63364 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_GenerateControllerAction=\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u306e\u4f5c\u6210
 ERR_CannotCreateController=\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fb\u30bd\u30fc\u30b9\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f: {0}
 ERR_controllerClassAmbiguous=\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fb\u30af\u30e9\u30b9\u540d\u304c\u3042\u3044\u307e\u3044\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/codegen/Bundle_ja.properties
index f8143b4..3923a2d 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/codegen/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AddPropertyPanel.nameLabel.text=\u540d\u524d(&N):
 AddPropertyPanel.nameTextField.text=\u6587\u5b57\u5217
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/css/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/css/Bundle_ja.properties
index d2d35dd..0c744ee 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/css/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/css/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JavaFXCSSModule.displayName=JavaFX
 
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/fxml/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/fxml/Bundle_ja.properties
index b9e658b..c22e76e 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/fxml/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/fxml/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_EditAction=\u7de8\u96c6
 CTL_OpenAction=\u958b\u304f
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/parser/Bundle_ja.properties
index 54c2ef1..180bcb6 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/parser/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - parent tag local name
 ERR_doesNotAcceptProperty=\u89aa\u8981\u7d20{0}\u306f\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u53d7\u3051\u5165\u308c\u307e\u305b\u3093
 ERR_duplicateDefinitions='definitions'\u8981\u7d20\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/parser/processors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/parser/processors/Bundle_ja.properties
index 3e20c33..260ab34 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/parser/processors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/parser/processors/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {1} - attached property name
 # {0} - source class name
 ERR_attachedPropertyNotExist=\u30af\u30e9\u30b9''{0}''\u306f\u3001\u30a2\u30bf\u30c3\u30c1\u3055\u308c\u305f\u30d7\u30ed\u30d1\u30c6\u30a3''{1}''\u3092\u63d0\u4f9b\u3057\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/sax/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/sax/Bundle_ja.properties
index 49203e9..4d67408 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/sax/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-editor/javafx2-editor/org/netbeans/modules/javafx2/editor/sax/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - attribute name
 ERR_DuplicateAttribute=\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: {0}
 # {0} - tag name
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-kit/javafx2-kit/org/netbeans/modules/javafx2/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-kit/javafx2-kit/org/netbeans/modules/javafx2/kit/Bundle_ja.properties
index d71fd73..5667ccc 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-kit/javafx2-kit/org/netbeans/modules/javafx2/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-kit/javafx2-kit/org/netbeans/modules/javafx2/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Long-Description=JavaFX 2.0\u306f\u3001\u30ea\u30c3\u30c1\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3068\u3057\u3066\u306eJava\u306e\u9032\u5316\u306b\u304a\u3051\u308b\u6b21\u306e\u30b9\u30c6\u30c3\u30d7\u3067\u3059\u3002\u3053\u308c\u306f\u3001\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u304a\u3088\u3073\u30d3\u30b8\u30cd\u30b9\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u3001\u8efd\u91cf\u306e\u3001\u30cf\u30fc\u30c9\u30a6\u30a7\u30a2\u3067\u9ad8\u901f\u5316\u3055\u308c\u305fJava UI\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3092\u63d0\u4f9b\u3059\u308b\u3088\u3046\u306b\u8a2d\u8a08\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 OpenIDE-Module-Name=JavaFX 2\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=JavaFX 2
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-platform/javafx2-platform/org/netbeans/modules/javafx2/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-platform/javafx2-platform/org/netbeans/modules/javafx2/platform/Bundle_ja.properties
index a9a2a17..fa2d1ef 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-platform/javafx2-platform/org/netbeans/modules/javafx2/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-platform/javafx2-platform/org/netbeans/modules/javafx2/platform/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=JavaFX 2
 OpenIDE-Module-Name=JavaFX 2\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
 
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ja.properties
index 39114a6..0d89ded 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 HINT_FX_Not_Supported_By_JDK=\u30a2\u30af\u30c6\u30a3\u30d6\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306fJavaFX\u306b\u5bfe\u5fdc\u3057\u3066\u3044\u307e\u305b\u3093\u3002
 LBL_FX_Not_Supported_By_JDK=Java\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306fFX\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u305b\u3093
 LBL_ResolveFXJDK=FX\u5bfe\u5fdcJava\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3092\u9078\u629e - "{0}"\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=JavaFX 2\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
 OpenIDE-Module-Display-Category=JavaFX 2
 
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/fxml/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/fxml/Bundle_ja.properties
index 68927b8..1a0362a 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/fxml/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/fxml/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Project/JavaFX/fxml.xml=JavaFX FXML\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
 Templates/javafx/FXML.java=\u7a7a\u306eFXML
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXML_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXML_ja.html
index a73e257..095a28f 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXML_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXML_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXMain_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXMain_ja.html
index 1629807..aeb1853 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXMain_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXMain_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXPreloader_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXPreloader_ja.html
index 0741187..179262d 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXPreloader_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXPreloader_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXSwingMain_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXSwingMain_ja.html
index 769c2c9..dc18edc 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXSwingMain_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/FXSwingMain_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXApp_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXApp_ja.html
index 1422c89..fe6acc5 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXApp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXExistingSources_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXExistingSources_ja.html
index 11cdb03..004bffc 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXExistingSources_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXExistingSources_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXMLApp_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXMLApp_ja.html
index 43ec929..6d13d2b 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXMLApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXMLApp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXPreloaderApp_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXPreloaderApp_ja.html
index d96f9ce..aecc128 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXPreloaderApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXPreloaderApp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXSwingApp_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXSwingApp_ja.html
index 605c3e6..1fc2021 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXSwingApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/templates/JavaFXSwingApp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/ui/Bundle_ja.properties
index b7d6bc1..e92cb3b 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 LBL_Category_Deployment=\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8
 LBL_Category_Run=\u5b9f\u884c
 LBL_Select_Icon_Image=\u30a2\u30a4\u30b3\u30f3\u30fb\u30a4\u30e1\u30fc\u30b8\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/Bundle_ja.properties
index 49e143b..7871bc4 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 ## manifest.mf
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/AdvancedMedia_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/AdvancedMedia_ja.html
index 2c6aa63..1f20928 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/AdvancedMedia_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/AdvancedMedia_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/AudioVisualizer3D_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/AudioVisualizer3D_ja.html
index fea9dd3..f774156 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/AudioVisualizer3D_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/AudioVisualizer3D_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/BrickBreaker_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/BrickBreaker_ja.html
index c41320e..7df0dba 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/BrickBreaker_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/BrickBreaker_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChangeListener_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChangeListener_ja.html
index bed49b0..81ed832 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChangeListener_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChangeListener_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedArea_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedArea_ja.html
index f716510..aff820e 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedArea_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedArea_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedBar_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedBar_ja.html
index d27933e..fcf86af 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedBar_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedBar_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedPie_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedPie_ja.html
index d270885..afcbfd4 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedPie_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedPie_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedScatterLive_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedScatterLive_ja.html
index f9e1126..d65898e 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedScatterLive_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedScatterLive_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedScatter_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedScatter_ja.html
index 496b26e..422185d 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedScatter_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedScatter_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedStockLine_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedStockLine_ja.html
index f33f248..ef3c4d3 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedStockLine_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAdvancedStockLine_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAudioArea_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAudioArea_ja.html
index c267542..3f42336 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAudioArea_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAudioArea_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAudioBar_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAudioBar_ja.html
index e3042b4..a9a9cea 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAudioBar_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartAudioBar_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartLine_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartLine_ja.html
index 5688997..da90aa0 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartLine_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ChartLine_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ColorPicker_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ColorPicker_ja.html
index 9cfb8a8..96a4d30 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ColorPicker_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ColorPicker_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ColorfulCircles_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ColorfulCircles_ja.html
index 4bf663c..26233af 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ColorfulCircles_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/ColorfulCircles_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/CreateAdvancedStage_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/CreateAdvancedStage_ja.html
index 13e7438..6ab3a8e 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/CreateAdvancedStage_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/CreateAdvancedStage_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Cube3D_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Cube3D_ja.html
index e332601..856251a 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Cube3D_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Cube3D_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/CubeSystem3D_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/CubeSystem3D_ja.html
index 2a60a98..0d8b674 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/CubeSystem3D_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/CubeSystem3D_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/DigitalClock_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/DigitalClock_ja.html
index 7a2a151..f1761cb 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/DigitalClock_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/DigitalClock_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/DisplayShelf_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/DisplayShelf_ja.html
index 296a33d..0cb5a95 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/DisplayShelf_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/DisplayShelf_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/FXML-LoginDemo_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/FXML-LoginDemo_ja.html
index 3bda0c2..7fd283b 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/FXML-LoginDemo_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/FXML-LoginDemo_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Fireworks_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Fireworks_ja.html
index 35b5424..4b6352a 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Fireworks_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Fireworks_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/HTMLEditorApp_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/HTMLEditorApp_ja.html
index 70f03da..c818544 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/HTMLEditorApp_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/HTMLEditorApp_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/KeyStrokeMotion_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/KeyStrokeMotion_ja.html
index 131da2d..9a67186 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/KeyStrokeMotion_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/KeyStrokeMotion_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/MouseEvents_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/MouseEvents_ja.html
index 8af90a1..84f1673 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/MouseEvents_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/MouseEvents_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/PaginationDemo_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/PaginationDemo_ja.html
index 6fac8ac..8a16819 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/PaginationDemo_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/PaginationDemo_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/PuzzlePieces_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/PuzzlePieces_ja.html
index ed7d7ee..cd7af7c 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/PuzzlePieces_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/PuzzlePieces_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/StopWatch_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/StopWatch_ja.html
index ec2f01c..7078a29 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/StopWatch_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/StopWatch_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/SwingInterop_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/SwingInterop_ja.html
index 96d746e..d052ec8 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/SwingInterop_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/SwingInterop_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TimelineEvents_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TimelineEvents_ja.html
index 42f12fb..31e78cd 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TimelineEvents_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TimelineEvents_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TimelineInterpolator_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TimelineInterpolator_ja.html
index 716f9ca..4b43519 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TimelineInterpolator_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TimelineInterpolator_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TransitionPath_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TransitionPath_ja.html
index b4387ee..349ee55 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TransitionPath_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TransitionPath_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TransitionRotate_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TransitionRotate_ja.html
index 6844cd8..6f5bcf9 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TransitionRotate_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/TransitionRotate_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/WebViewBrowser_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/WebViewBrowser_ja.html
index 1012d0b..6dd6dc3 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/WebViewBrowser_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/WebViewBrowser_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Xylophone_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Xylophone_ja.html
index 59a877b..2befc55 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Xylophone_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/Xylophone_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/samples_ja.html b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/samples_ja.html
index 51f6f6d..533ba94 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/samples_ja.html
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-samples/javafx2-samples/org/netbeans/modules/javafx2/samples/resources/samples_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/Bundle_ja.properties
index f09efa4..5c0e19a 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - file system display name
 
diff --git a/netbeans-l10n-zip/src/ja/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/options/Bundle_ja.properties
index e649d49..0d72530 100755
--- a/netbeans-l10n-zip/src/ja/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/javafx/javafx2-scenebuilder/javafx2-scenebuilder/org/netbeans/modules/javafx2/scenebuilder/options/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AdvancedOption_DisplayName_SB=JavaFX
 AdvancedOption_Keywords_SB=javafx
 KW_JavaFXOptions=JavaFX,Scene Builder
@@ -6,43 +23,6 @@
 LBL_Default=\u30c7\u30d5\u30a9\u30eb\u30c8
 MSG_InvalidHome=\u6709\u52b9\u306aScene Builder\u30db\u30fc\u30e0\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044...
 MSG_InvalidSBHome=<html>\u9078\u629e\u3057\u305f\u5834\u6240<p><b>{0}</b></p>\u306b\u306f\u6709\u52b9\u306aJavaFX Scene Builder\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u304c\u8868\u793a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 TIT_Select=Scene Builder\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u5834\u6240\u3092\u9078\u629e
 SBHOME_Browse=\u53c2\u7167...
 SBOptionsPanel.sbHomeLabel.text=Scene Builder\u30db\u30fc\u30e0(&C):
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-common-ant/j2me-common-ant/org/netbeans/modules/j2me/common/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-common-ant/j2me-common-ant/org/netbeans/modules/j2me/common/ant/Bundle_ja.properties
index c1d8c79..607fde1 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-common-ant/j2me-common-ant/org/netbeans/modules/j2me/common/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-common-ant/j2me-common-ant/org/netbeans/modules/j2me/common/ant/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java ME
 OpenIDE-Module-Long-Description=Java ME 8 Embedded\u304a\u3088\u3073Java ME 3.x (\u524d\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u542b\u3080)\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u3067\u5171\u6709\u3055\u308c\u308bAnt\u30bf\u30b9\u30af\u3002
 OpenIDE-Module-Name=Java ME\u5171\u901aAnt\u30bf\u30b9\u30af
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/j2me-keystore/org/netbeans/modules/j2me/keystore/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/j2me-keystore/org/netbeans/modules/j2me/keystore/Bundle_ja.properties
index 70eeec9..4065f09 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/j2me-keystore/org/netbeans/modules/j2me/keystore/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/j2me-keystore/org/netbeans/modules/j2me/keystore/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_KeystoreAction=\u30ad\u30fc\u30b9\u30c8\u30a2\u7ba1\u7406
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=Java ME
 OpenIDE-Module-Long-Description=Java ME\u30ad\u30fc\u30b9\u30c8\u30a2\u7ba1\u7406\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001IDE\u304b\u3089\u76f4\u63a5\u30ad\u30fc\u30b9\u30c8\u30a2\u3092\u7ba1\u7406\u3067\u304d\u308b\u30c4\u30fc\u30eb\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Java ME\u30ad\u30fc\u30b9\u30c8\u30a2\u7ba1\u7406
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/j2me-keystore/org/netbeans/modules/j2me/keystore/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/j2me-keystore/org/netbeans/modules/j2me/keystore/ui/Bundle_ja.properties
index b86f025..b041056 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/j2me-keystore/org/netbeans/modules/j2me/keystore/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/j2me-keystore/org/netbeans/modules/j2me/keystore/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/netbeans/ant/nblib/j2me-keystore/org/netbeans/modules/j2me/keystore/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/netbeans/ant/nblib/j2me-keystore/org/netbeans/modules/j2me/keystore/ant/Bundle_ja.properties
index 8de294c..e8f93e0 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/netbeans/ant/nblib/j2me-keystore/org/netbeans/modules/j2me/keystore/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-keystore/netbeans/ant/nblib/j2me-keystore/org/netbeans/modules/j2me/keystore/ant/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-kit/j2me-kit/org/netbeans/modules/j2me/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-kit/j2me-kit/org/netbeans/modules/j2me/kit/Bundle_ja.properties
index b866d1b..68ee094 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-kit/j2me-kit/org/netbeans/modules/j2me/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-kit/j2me-kit/org/netbeans/modules/j2me/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java ME
 OpenIDE-Module-Name=Java ME\u30b3\u30a2
 OpenIDE-Module-Short-Description=Java ME\u30b3\u30a2\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/Bundle_ja.properties
index eb18915..dfb5715 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_InvalidPlatform=Java ME\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306f\u7121\u52b9\u3067\u3059
 LBL_InvalidPlatformDesc=\u30a2\u30af\u30c6\u30a3\u30d6\u306aJava ME\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306f\u58ca\u308c\u3066\u3044\u308b\u304b\u3001\u3042\u308a\u307e\u305b\u3093\u3002
 LBL_ResolveME_SDK=Java ME\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u9078\u629e - "{0}"\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=Java ME
 OpenIDE-Module-Long-Description=Java ME 8 Embedded\u7528\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8\u3002
 OpenIDE-Module-Name=Java ME\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/api/Bundle_ja.properties
index 8cb5b80..e99f550 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 COMMENT_dist.dir=\u3053\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u6d88\u53bb\u3055\u308c\u308b\u3068\u524a\u9664\u3055\u308c\u307e\u3059:
 COMMENT_debug.transport=\u30b3\u30e1\u30f3\u30c8\u89e3\u9664\u3057\u3066\u3001\u512a\u5148\u3059\u308b\u30c7\u30d0\u30c3\u30ac\u63a5\u7d9a\u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8\u3092\u6307\u5b9a\u3057\u307e\u3059:
 COMMENT_javac.compilerargs=\u8ffd\u52a0javac\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u30b9\u30da\u30fc\u30b9\u533a\u5207\u308a\u30ea\u30b9\u30c8
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ota/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ota/Bundle_ja.properties
index 8d08377..30b25bd 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ota/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ota/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/resources/Bundle_ja.properties
index 4779b1f..8529202 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 Templates/Project/JavaME=Java ME Embedded
 Templates/javame=Java ME Embedded
 Templates/javame/MEEPlet.java=MIDlet
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/templates/MEEPlet_ja.html b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/templates/MEEPlet_ja.html
index 29cd255..e2dd20b 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/templates/MEEPlet_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/templates/MEEPlet_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/templates/samples_ja.html b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/templates/samples_ja.html
index b141449..540ded7 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/templates/samples_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/templates/samples_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/Bundle_ja.properties
index 584c1e8..544da84 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #LibrariesNodeProvider
 CTL_LibrariesNode=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/customizer/Bundle_ja.properties
index ef51864..44ee4d5 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/customizer/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Category_Application_Descriptor=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf
 LBL_Category_Compiling=\u30b3\u30f3\u30d1\u30a4\u30eb
 LBL_Category_JavaDoc=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u5316
@@ -7,43 +24,6 @@
 LBL_Category_Run=\u5b9f\u884c
 LBL_Category_Signing=\u7f72\u540d
 LBL_Category_Sources=\u30bd\u30fc\u30b9
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 # CustomizerDialog
 LBL_Customizer_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3 - {0}
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/resources/emptyProject_ja.html b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/resources/emptyProject_ja.html
index 8f925c1..4b4f802 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/resources/emptyProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/ui/resources/emptyProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/wizard/Bundle_ja.properties
index a4f9088..b1da7f6 100755
--- a/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/j2me-project/j2me-project/org/netbeans/modules/j2me/project/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_JavaTargetChooser_WrongPlatform=\u4e0d\u6b63\u306a\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30bd\u30fc\u30b9\u30fb\u30ec\u30d9\u30eb\u3002\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u306f\u3001Java 5\u6a5f\u80fd\u304c\u542b\u307e\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30b3\u30f3\u30d1\u30a4\u30eb\u3067\u304d\u307e\u305b\u3093\u3002
 LAB_IteratorName={0}/{1}
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/Bundle_ja.properties
index 0716412..1d37e81 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/cfgfactory/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/cfgfactory/Bundle_ja.properties
index e039e84..de6c0e5 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/cfgfactory/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/cfgfactory/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CLDCProjectConfigurationFactory=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u305fCLDC\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u304c\u63d0\u4f9b\u3059\u308b\u69cb\u6210\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/Bundle_ja.properties
index a586aac..ad843eb 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/debuggerinfo_ja.html b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/debuggerinfo_ja.html
index 10db1da..61dfbb4 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/debuggerinfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/debuggerinfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/executioninfo_ja.html b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/executioninfo_ja.html
index 99c9432..807a463 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/executioninfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/executioninfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/preverifyinfo_ja.html b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/preverifyinfo_ja.html
index 440a727..78c6150 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/preverifyinfo_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/customwizard/preverifyinfo_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/Bundle_ja.properties
index 36ee5db..3f7ef55 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/j2meplatformdefinition_ja.html b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/j2meplatformdefinition_ja.html
index 42496ed..a3543ad 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/j2meplatformdefinition_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/j2meplatformdefinition_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/kjavaplatformdefinition_ja.html b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/kjavaplatformdefinition_ja.html
index 280330b..a3543ad 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/kjavaplatformdefinition_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/resources/templates/kjavaplatformdefinition_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/startup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/startup/Bundle_ja.properties
index a5c7f13..cc9e8c9 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/startup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/startup/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/wizard/Bundle_ja.properties
index 6520248..017d4bf 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-cldcplatform/mobility-cldcplatform/org/netbeans/modules/mobility/cldcplatform/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-databindingme/mobility-databindingme/org/netbeans/modules/mobility/databindingme/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-databindingme/mobility-databindingme/org/netbeans/modules/mobility/databindingme/resources/Bundle_ja.properties
index 04b7f12..11cc430 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-databindingme/mobility-databindingme/org/netbeans/modules/mobility/databindingme/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-databindingme/mobility-databindingme/org/netbeans/modules/mobility/databindingme/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/e2e/mapping/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/e2e/mapping/Bundle_ja.properties
index 87e476d..24453bc 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/e2e/mapping/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/e2e/mapping/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_Client=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u751f\u6210\u3057\u3066\u3044\u307e\u3059
 MSG_Bean_Generation=Beans\u3092\u751f\u6210\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/Bundle_ja.properties
index f4af51f..a9b49c9 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/codegenerator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/codegenerator/Bundle_ja.properties
index 02fc2ed..1fcde35 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/codegenerator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/codegenerator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/multiview/Bundle_ja.properties
index 067fd79..c48b593 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/multiview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/output/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/output/Bundle_ja.properties
index 05b8075..9477061 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/output/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/output/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # for translators: the text [WARNING] is used in textual log files to mark warning messages. 
 # Can be translated if there is a policy to translate log file contents.
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/resources/descriptions/MIDP/E2EWebApplication_wsclient_ja.html b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/resources/descriptions/MIDP/E2EWebApplication_wsclient_ja.html
index 74eae6c..4ed1103 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/resources/descriptions/MIDP/E2EWebApplication_wsclient_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/resources/descriptions/MIDP/E2EWebApplication_wsclient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/editor/Bundle_ja.properties
index 9fe9cc0..52189bb 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/wizard/Bundle_ja.properties
index 59edb29..7b56bff 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/ui/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/util/Bundle_ja.properties
index d6861ad..294da76 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-end2end/mobility-end2end/org/netbeans/modules/mobility/end2end/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/e2e/wsdl/wsdl2java/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/e2e/wsdl/wsdl2java/Bundle_ja.properties
index 0e71de0..5322a0d 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/e2e/wsdl/wsdl2java/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/e2e/wsdl/wsdl2java/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Error messages
 0001= \u64cd\u4f5c{0}\u306e\u30b9\u30bf\u30a4\u30eb\u306f\u300c\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u300d\u306b\u3057\u3066\u304f\u3060\u3055\u3044
 0002= \u64cd\u4f5c{0}\u306e\u672c\u4f53{1}\u306f\u300c\u30ea\u30c6\u30e9\u30eb\u300d\u306b\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/Bundle_ja.properties
index 30025b3..941abb0 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/generator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/generator/Bundle_ja.properties
index 7260245..0fa9d27 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/generator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/generator/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/multiview/Bundle_ja.properties
index 4d38183..7f8264b 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/multiview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/resources/descriptions/MIDP/JSR172_wsclient_ja.html b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/resources/descriptions/MIDP/JSR172_wsclient_ja.html
index c7ecc1a..5368f39 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/resources/descriptions/MIDP/JSR172_wsclient_ja.html
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/resources/descriptions/MIDP/JSR172_wsclient_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
- -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/wizard/Bundle_ja.properties
index 3f0ef3f..5b26cb0 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-jsr172/mobility-jsr172/org/netbeans/modules/mobility/jsr172/wizard/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-licensing/mobility-licensing/org/netbeans/modules/mobility/licensing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-licensing/mobility-licensing/org/netbeans/modules/mobility/licensing/Bundle_ja.properties
index 877afb9..0e4ceec 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-licensing/mobility-licensing/org/netbeans/modules/mobility/licensing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-licensing/mobility-licensing/org/netbeans/modules/mobility/licensing/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Mobility\u306e\u4f7f\u7528\u8a31\u8afe
 OpenIDE-Module-Display-Category=Java ME
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-project-ant/mobility-project-ant/org/netbeans/modules/mobility/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-project-ant/mobility-project-ant/org/netbeans/modules/mobility/project/Bundle_ja.properties
index be559a3..945a4a9 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-project-ant/mobility-project-ant/org/netbeans/modules/mobility/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-project-ant/mobility-project-ant/org/netbeans/modules/mobility/project/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Java ME\u30d3\u30eb\u30c9\u30fb\u30b7\u30b9\u30c6\u30e0\u306e\u30c7\u30d0\u30c3\u30ac\u30fb\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Java ME
 OpenIDE-Module-Short-Description=Java ME\u30d3\u30eb\u30c9\u30fb\u30b7\u30b9\u30c6\u30e0\u30fb\u30b3\u30a2\u306e\u30c7\u30d0\u30c3\u30ac\u30fb\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/mobility/mobility-project-ant/netbeans/ant/nblib/mobility-project-ant/org/netbeans/modules/mobility/project/ant/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/mobility-project-ant/netbeans/ant/nblib/mobility-project-ant/org/netbeans/modules/mobility/project/ant/Bundle_ja.properties
index f1aedc6..9829011 100755
--- a/netbeans-l10n-zip/src/ja/mobility/mobility-project-ant/netbeans/ant/nblib/mobility-project-ant/org/netbeans/modules/mobility/project/ant/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/mobility-project-ant/netbeans/ant/nblib/mobility-project-ant/org/netbeans/modules/mobility/project/ant/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/mobility/org-netbeans-api-mobility/org-netbeans-api-mobility/org/netbeans/modules/mobility/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/mobility/org-netbeans-api-mobility/org-netbeans-api-mobility/org/netbeans/modules/mobility/Bundle_ja.properties
index 2631f68..3d1feac 100755
--- a/netbeans-l10n-zip/src/ja/mobility/org-netbeans-api-mobility/org-netbeans-api-mobility/org/netbeans/modules/mobility/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/mobility/org-netbeans-api-mobility/org-netbeans-api-mobility/org/netbeans/modules/mobility/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/Bundle_ja.properties
index e9ce87a..d2ad840 100755
--- a/netbeans-l10n-zip/src/ja/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Name=\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30a4\u30f3\u30dd\u30fc\u30c8\u6a5f\u80fd
 OpenIDE-Module-Short-Description=\u6307\u5b9a\u3057\u305fNetBeans\u30af\u30e9\u30b9\u30bf\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30a4\u30f3\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle_ja.properties
index e21886e..15d1df2 100755
--- a/netbeans-l10n-zip/src/ja/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/autoupdate-pluginimporter/autoupdate-pluginimporter/org/netbeans/modules/autoupdate/pluginimporter/libinstaller/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 accept_button=JUnit\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
 cancel=\u53d6\u6d88
diff --git a/netbeans-l10n-zip/src/ja/nb/bugzilla-exceptionreporter/bugzilla-exceptionreporter/org/netbeans/modules/bugzilla/exceptionreporter/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/bugzilla-exceptionreporter/bugzilla-exceptionreporter/org/netbeans/modules/bugzilla/exceptionreporter/Bundle_ja.properties
index 0197a4b..0fab940 100755
--- a/netbeans-l10n-zip/src/ja/nb/bugzilla-exceptionreporter/bugzilla-exceptionreporter/org/netbeans/modules/bugzilla/exceptionreporter/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/bugzilla-exceptionreporter/bugzilla-exceptionreporter/org/netbeans/modules/bugzilla/exceptionreporter/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30c1\u30fc\u30e0
 OpenIDE-Module-Name=Bugzilla-\u4f8b\u5916\u30ec\u30dd\u30fc\u30bf\u30fb\u30d6\u30ea\u30c3\u30b8
diff --git a/netbeans-l10n-zip/src/ja/nb/deadlock-detector/deadlock-detector/org/netbeans/modules/deadlock/detector/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/deadlock-detector/deadlock-detector/org/netbeans/modules/deadlock/detector/Bundle_ja.properties
index ecd8601..2b3aa24 100755
--- a/netbeans-l10n-zip/src/ja/nb/deadlock-detector/deadlock-detector/org/netbeans/modules/deadlock/detector/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/deadlock-detector/deadlock-detector/org/netbeans/modules/deadlock/detector/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Oracle, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_DeadlockDetected=\u30c7\u30c3\u30c9\u30ed\u30c3\u30af\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002\n\u30ea\u30ab\u30d0\u30ea\u306e\u305f\u3081\u306bIDE\u3092\u518d\u8d77\u52d5\u3059\u308b\u3053\u3068\u3092\u304a\u85a6\u3081\u3057\u307e\u3059\u3002
 OpenIDE-Module-Long-Description=\u30e2\u30b8\u30e5\u30fc\u30eb\u306fjava.lang.management.ThreadMXBean\u3092\u4f7f\u7528\u3057\u3066\u30c7\u30c3\u30c9\u30ed\u30c3\u30af\u3092\u691c\u51fa\u3057\u307e\u3059\u3002\u30c7\u30c3\u30c9\u30ed\u30c3\u30af\u60c5\u5831\u306f\u4e00\u6642\u30d5\u30a1\u30a4\u30eb\u306b\u66f8\u304d\u8fbc\u307e\u308c\u3001\u30ed\u30ac\u30fc\u6a5f\u80fd\u3092\u4f7f\u7528\u3057\u3066\u4f8b\u5916\u30ec\u30dd\u30fc\u30bf\u306b\u9001\u4fe1\u3055\u308c\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding-kit/ide-branding-kit/org/netbeans/modules/ide/branding/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding-kit/ide-branding-kit/org/netbeans/modules/ide/branding/kit/Bundle_ja.properties
index e8b3094..a8f0a79 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding-kit/ide-branding-kit/org/netbeans/modules/ide/branding/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding-kit/ide-branding-kit/org/netbeans/modules/ide/branding/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=NetBeans\u306e\u7279\u5b9a\u30ea\u30ea\u30fc\u30b9\u306e\u5185\u5bb9\u3068\u30d6\u30e9\u30f3\u30c9\u60c5\u5831\u3067\u3001\u958b\u59cb\u753b\u9762\u3001\u30d6\u30e9\u30f3\u30c9\u60c5\u5831\u3001\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30fb\u30bb\u30f3\u30bf\u30fc\u306e\u5b9a\u7fa9\u3001\u4f8b\u5916\u30ec\u30dd\u30fc\u30c8\u306a\u3069\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
 OpenIDE-Module-Name=IDE\u30d6\u30e9\u30f3\u30c7\u30a3\u30f3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/ide-branding/org/netbeans/modules/ide/branding/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/ide-branding/org/netbeans/modules/ide/branding/Bundle_ja.properties
index 4d8b827..b76b856 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/ide-branding/org/netbeans/modules/ide/branding/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/ide-branding/org/netbeans/modules/ide/branding/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest.mf
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/Bundle_nb_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/Bundle_nb_ja.properties
index 7869871..bc00f15 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/Bundle_nb_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/Bundle_nb_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/actions/Bundle_nb_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/actions/Bundle_nb_ja.properties
index 3010199..d9fc0b4 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/actions/Bundle_nb_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/actions/Bundle_nb_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 AutoupdateCheckScheduler_UpdatesFound_ToolTip={0}\u500b\u306e\u66f4\u65b0\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
 AutoupdateCheckScheduler_UpdateFound_ToolTip={0}\u500b\u306e\u66f4\u65b0\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002
 AutoupdateCheckScheduler_UpdateFound_Hint=IDE\u3092\u6700\u65b0\u306e\u72b6\u614b\u306b\u3059\u308b\u306b\u306f\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb_ja.properties
index 8871a43..2158aca 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/autoupdate-ui_nb/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OperationDescriptionStep_Header_Head=NetBeans IDE\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d
 OperationDescriptionStep_HeaderUninstall_Head=NetBeans IDE\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d
 OperationDescriptionStep_HeaderActivate_Head=NetBeans IDE\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/options-api_nb/org/netbeans/modules/options/export/Bundle_nb_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/options-api_nb/org/netbeans/modules/options/export/Bundle_nb_ja.properties
index 55623af..b8d628f 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/options-api_nb/org/netbeans/modules/options/export/Bundle_nb_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/options-api_nb/org/netbeans/modules/options/export/Bundle_nb_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OptionsChooserPanel.import.error=\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u4e2d\u306b\u30a8\u30e9\u30fc\u30fb\u30d1\u30e9\u30e1\u30fc\u30bf -J-Dorg.netbeans.modules.options.export.level=100\u3092\u6307\u5b9a\u3057\u3066IDE\u3092\u5b9f\u884c\u3057\u3001IDE\u306e\u30ed\u30b0\u3067\u8a73\u7d30\u60c5\u5831\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 ImportConfirmationPanel.cbRestart.text=<html>\u4eca\u3059\u3050IDE\u3092\u518d\u8d77\u52d5<br>(\u518d\u8d77\u52d5\u3057\u306a\u3044\u3068\u3001\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u305f\u8a2d\u5b9a\u304c\u6a5f\u80fd\u3057\u306a\u3044\u53ef\u80fd\u6027\u304c\u3042\u308b)(&R)</html>
 ImportConfirmationPanel.cbRestart.AD=IDE\u3092\u4eca\u518d\u8d77\u52d5\u3059\u308b\u304b\u5f8c\u3067\u3059\u308b\u304b\u6c7a\u3081\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/org-netbeans-core-ui_nb/org/netbeans/core/ui/sampler/Bundle_nb_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/org-netbeans-core-ui_nb/org/netbeans/core/ui/sampler/Bundle_nb_ja.properties
index dd8018a..2cb5b06 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/org-netbeans-core-ui_nb/org/netbeans/core/ui/sampler/Bundle_nb_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/org-netbeans-core-ui_nb/org/netbeans/core/ui/sampler/Bundle_nb_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 SelfSamplerAction_ActionNameStart=IDE\u3092\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb
 SelfSamplerAction_ActionNameStop=IDE\u306e\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u3092\u505c\u6b62\u3057\u3066\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3092\u53d6\u5f97
 
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/org-netbeans-core_nb/org/netbeans/core/Bundle_nb_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/org-netbeans-core_nb/org/netbeans/core/Bundle_nb_ja.properties
index a95c298..79f46b3 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/org-netbeans-core_nb/org/netbeans/core/Bundle_nb_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/org-netbeans-core_nb/org/netbeans/core/Bundle_nb_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - class name of exception
 # {1} - path to system folder
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/exceptions/Bundle_nb_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/exceptions/Bundle_nb_ja.properties
index d56a234..b27da23 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/exceptions/Bundle_nb_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/exceptions/Bundle_nb_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/uihandler/Bundle_nb_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/uihandler/Bundle_nb_ja.properties
index 7f5c703..c304a23 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/uihandler/Bundle_nb_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/locale/uihandler_nb/org/netbeans/modules/uihandler/Bundle_nb_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/nb/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_ja.properties b/netbeans-l10n-zip/src/ja/nb/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_ja.properties
index 904f17d..3cce038 100755
--- a/netbeans-l10n-zip/src/ja/nb/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/ide-branding/netbeans/core/locale/core_nb/org/netbeans/core/startup/Bundle_nb_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Splash
 
diff --git a/netbeans-l10n-zip/src/ja/nb/org-netbeans-modules-welcome.nbm/netbeans/docs/GUIExamplesDescription_ja.html b/netbeans-l10n-zip/src/ja/nb/org-netbeans-modules-welcome.nbm/netbeans/docs/GUIExamplesDescription_ja.html
index d3e8926..b5c3c41 100755
--- a/netbeans-l10n-zip/src/ja/nb/org-netbeans-modules-welcome.nbm/netbeans/docs/GUIExamplesDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/nb/org-netbeans-modules-welcome.nbm/netbeans/docs/GUIExamplesDescription_ja.html
@@ -1,47 +1,29 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>GUIフォームの例</title>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 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]"
-
-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.
-
-Contributor(s):
--->
         <link rel="stylesheet" type="text/css" href="netbeans.css" media="screen">
 
 </head>
diff --git a/netbeans-l10n-zip/src/ja/nb/org-netbeans-upgrader/netbeans/core/org-netbeans-upgrader/org/netbeans/license/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/org-netbeans-upgrader/netbeans/core/org-netbeans-upgrader/org/netbeans/license/Bundle_ja.properties
index 5fa47c3..cb78f47 100755
--- a/netbeans-l10n-zip/src/ja/nb/org-netbeans-upgrader/netbeans/core/org-netbeans-upgrader/org/netbeans/license/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/org-netbeans-upgrader/netbeans/core/org-netbeans-upgrader/org/netbeans/license/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Licence dialog
 MSG_LicenseDlgTitle=\u30e9\u30a4\u30bb\u30f3\u30b9\u5951\u7d04
diff --git a/netbeans-l10n-zip/src/ja/nb/org-netbeans-upgrader/netbeans/core/org-netbeans-upgrader/org/netbeans/upgrade/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/org-netbeans-upgrader/netbeans/core/org-netbeans-upgrader/org/netbeans/upgrade/Bundle_ja.properties
index 74f26ed..e6d6ffc 100755
--- a/netbeans-l10n-zip/src/ja/nb/org-netbeans-upgrader/netbeans/core/org-netbeans-upgrader/org/netbeans/upgrade/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/org-netbeans-upgrader/netbeans/core/org-netbeans-upgrader/org/netbeans/upgrade/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30a2\u30c3\u30d7\u30b0\u30ec\u30fc\u30c9
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/nb/uihandler-exceptionreporter/uihandler-exceptionreporter/org/netbeans/modules/uihandler/exceptionreporter/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/uihandler-exceptionreporter/uihandler-exceptionreporter/org/netbeans/modules/uihandler/exceptionreporter/Bundle_ja.properties
index 7d392f2..7951b57 100755
--- a/netbeans-l10n-zip/src/ja/nb/uihandler-exceptionreporter/uihandler-exceptionreporter/org/netbeans/modules/uihandler/exceptionreporter/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/uihandler-exceptionreporter/uihandler-exceptionreporter/org/netbeans/modules/uihandler/exceptionreporter/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb
 OpenIDE-Module-Name=\u4f8b\u5916\u30ec\u30dd\u30fc\u30bf
 OpenIDE-Module-Short-Description=\u4f8b\u5916\u306e\u30ec\u30dd\u30fc\u30c8\u3092UI\u30b8\u30a7\u30b9\u30c1\u30e3\u30fb\u30b5\u30fc\u30d0\u30fc\u306b\u5bfe\u3057\u3066\u81ea\u52d5\u7684\u306b\u4f5c\u6210\u3067\u304d\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_ja.properties
index aa2fcef..b936aaf 100755
--- a/netbeans-l10n-zip/src/ja/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/updatecenters/updatecenters/org/netbeans/modules/updatecenters/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ### Resource bundle for package org.netbeans.modules.updatecenters.resources
 
diff --git a/netbeans-l10n-zip/src/ja/nb/welcome/welcome/org/netbeans/modules/welcome/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/welcome/welcome/org/netbeans/modules/welcome/Bundle_ja.properties
index aad6e2b..bd2ad02 100755
--- a/netbeans-l10n-zip/src/ja/nb/welcome/welcome/org/netbeans/modules/welcome/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/welcome/welcome/org/netbeans/modules/welcome/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_Action=\u958b\u59cb\u30da\u30fc\u30b8(&P)
diff --git a/netbeans-l10n-zip/src/ja/nb/welcome/welcome/org/netbeans/modules/welcome/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/nb/welcome/welcome/org/netbeans/modules/welcome/resources/Bundle_ja.properties
index 335af49..ae54188 100755
--- a/netbeans-l10n-zip/src/ja/nb/welcome/welcome/org/netbeans/modules/welcome/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/nb/welcome/welcome/org/netbeans/modules/welcome/resources/Bundle_ja.properties
@@ -1,44 +1,22 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
-
-
 #
 # Web Links
 #
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/groups/documentation-group/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/groups/documentation-group/data/Bundle_ja.properties
index 462a6d0..0b28717 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/groups/documentation-group/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/groups/documentation-group/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 group.display.name=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/groups/nb-addons-group/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/groups/nb-addons-group/data/Bundle_ja.properties
index 711ad64..f24e41b 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/groups/nb-addons-group/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/groups/nb-addons-group/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 group.display.name=\u30d7\u30e9\u30b0\u30a4\u30f3
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/groups/nb-ide-group/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/groups/nb-ide-group/data/Bundle_ja.properties
index 3ff0356..155f1ca 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/groups/nb-ide-group/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/groups/nb-ide-group/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/groups/runtimes-group/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/groups/runtimes-group/data/Bundle_ja.properties
index 1aa067b..19f35f1 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/groups/runtimes-group/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/groups/runtimes-group/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 group.display.name=\u30e9\u30f3\u30bf\u30a4\u30e0
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/groups/tools-group/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/groups/tools-group/data/Bundle_ja.properties
index d4dffbe..5cfeec8 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/groups/tools-group/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/groups/tools-group/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 group.display.name=\u30c4\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/data/Bundle_ja.properties
index c4b18e0..98238e9 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/Bundle_ja.properties
index 98928d5..4e2766a 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/wizard/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/wizard/panels/Bundle_ja.properties
index 0e176dc..5a6a2f5 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/wizard/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish-mod/src/org/netbeans/installer/products/glassfish/mod/wizard/panels/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish/data/Bundle_ja.properties
index 010e523..bfb22d6 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/glassfish/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-blueprints/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-blueprints/data/Bundle_ja.properties
index 8cbf7f4..1c9cd25 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-blueprints/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-blueprints/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-firstcup/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-firstcup/data/Bundle_ja.properties
index 74e0428..f626e87 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-firstcup/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-firstcup/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-firstcup/src/org/netbeans/installer/products/javaeesdk/firstcup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-firstcup/src/org/netbeans/installer/products/javaeesdk/firstcup/Bundle_ja.properties
index 1b9e85d..b92715b 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-firstcup/src/org/netbeans/installer/products/javaeesdk/firstcup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-firstcup/src/org/netbeans/installer/products/javaeesdk/firstcup/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-javadocs/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-javadocs/data/Bundle_ja.properties
index 5173a0a..1e1dc2b 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-javadocs/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-javadocs/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-samples/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-samples/data/Bundle_ja.properties
index 41d92e8..222de21 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-samples/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-samples/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-samples/src/org/netbeans/installer/products/javaeesdk/samples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-samples/src/org/netbeans/installer/products/javaeesdk/samples/Bundle_ja.properties
index ac53224..b665c39 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-samples/src/org/netbeans/installer/products/javaeesdk/samples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/javaeesdk-samples/src/org/netbeans/installer/products/javaeesdk/samples/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/data/Bundle_ja.properties
index 16a7aa7..d409140 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/src/org/netbeans/installer/products/jdk/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/src/org/netbeans/installer/products/jdk/Bundle_ja.properties
index 05f32ad..e1e3f42 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/src/org/netbeans/installer/products/jdk/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/src/org/netbeans/installer/products/jdk/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/src/org/netbeans/installer/products/jdk/wizard/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/src/org/netbeans/installer/products/jdk/wizard/panels/Bundle_ja.properties
index fb8e6fa..353225f 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/src/org/netbeans/installer/products/jdk/wizard/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/jdk/src/org/netbeans/installer/products/jdk/wizard/panels/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/jre-nested/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/jre-nested/data/Bundle_ja.properties
index ba0e810..376e3d7 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/jre-nested/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/jre-nested/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 product.display.name=JRE {display-version}
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/jre-nested/src/org/netbeans/installer/products/nestedjre/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/jre-nested/src/org/netbeans/installer/products/nestedjre/Bundle_ja.properties
index 05f32ad..e1e3f42 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/jre-nested/src/org/netbeans/installer/products/nestedjre/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/jre-nested/src/org/netbeans/installer/products/nestedjre/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/mysql/src/org/netbeans/installer/products/mysql/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/mysql/src/org/netbeans/installer/products/mysql/Bundle_ja.properties
index b3dfe83..25aa48e 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/mysql/src/org/netbeans/installer/products/mysql/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/mysql/src/org/netbeans/installer/products/mysql/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/mysql/src/org/netbeans/installer/products/mysql/wizard/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/mysql/src/org/netbeans/installer/products/mysql/wizard/panels/Bundle_ja.properties
index 02564cc..bed9642 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/mysql/src/org/netbeans/installer/products/mysql/wizard/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/mysql/src/org/netbeans/installer/products/mysql/wizard/panels/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/data/Bundle_ja.properties
index 9ecc357..3573ea1 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 product.display.name=\u30d9\u30fc\u30b9IDE
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/Bundle_ja.properties
index 8e3b9da..f9f0350 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/wizard/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/wizard/panels/Bundle_ja.properties
index 29e3287..3d33c18 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/wizard/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-base/src/org/netbeans/installer/products/nb/base/wizard/panels/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-cnd/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-cnd/data/Bundle_ja.properties
index 6706081..9418a87 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-cnd/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-cnd/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-ergonomics/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-ergonomics/data/Bundle_ja.properties
index a2c51e8..7ba0a9c 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-ergonomics/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-ergonomics/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 product.display.name=\u30aa\u30f3\u30fb\u30c7\u30de\u30f3\u30c9\u6a5f\u80fd
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-extide/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-extide/data/Bundle_ja.properties
index aea366b..f249bfb 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-extide/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-extide/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 product.display.name=\u62e1\u5f35IDE
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-groovy/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-groovy/data/Bundle_ja.properties
index ad5b781..9743cf3 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-groovy/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-groovy/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javacard/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javacard/data/Bundle_ja.properties
index 949e377..db0b1ef 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javacard/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javacard/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 product.display.name=Java Card(TM) 3 Connected
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javaee/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javaee/data/Bundle_ja.properties
index 30fa738..f587d8f 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javaee/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javaee/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 product.display.name=Java EE
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javaee/src/org/netbeans/installer/products/nb/javaee/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javaee/src/org/netbeans/installer/products/nb/javaee/Bundle_ja.properties
index 699df2d..0d31d5c 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javaee/src/org/netbeans/installer/products/nb/javaee/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javaee/src/org/netbeans/installer/products/nb/javaee/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 CL.install.tomcat.integration=IDE\u3068\u65e2\u5b58\u306eApache Tomcat\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3092\u7d71\u5408\u3057\u3066\u3044\u307e\u3059
 CL.install.error.tomcat.integration=IDE\u3068\u65e2\u5b58\u306eApache Tomcat\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3068\u306e\u7d71\u5408\u306b\u5931\u6557\u3057\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javafx-mod/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javafx-mod/data/Bundle_ja.properties
index ff14c67..068874a 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javafx-mod/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javafx-mod/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 product.display.name=Java FX
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javafx/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javafx/data/Bundle_ja.properties
index 8e6a1b8..d0c74bc 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javafx/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javafx/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javame/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javame/data/Bundle_ja.properties
index da88541..3c6645a 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javame/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javame/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javame/src/org/netbeans/installer/products/nb/javame/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javame/src/org/netbeans/installer/products/nb/javame/Bundle_ja.properties
index 15ea077..1e2159a 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javame/src/org/netbeans/installer/products/nb/javame/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javame/src/org/netbeans/installer/products/nb/javame/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 error.cannot.remove.end2end=Mobility\u30a8\u30f3\u30c9\u30c4\u30fc\u30a8\u30f3\u30c9\u30fb\u30d5\u30a1\u30a4\u30eb{0}\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javase/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javase/data/Bundle_ja.properties
index 7d694f0..4d8b6dc 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javase/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javase/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javase/src/org/netbeans/installer/products/nb/javase/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javase/src/org/netbeans/installer/products/nb/javase/Bundle_ja.properties
index caa9907..3e0a60c 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javase/src/org/netbeans/installer/products/nb/javase/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-javase/src/org/netbeans/installer/products/nb/javase/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-php/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-php/data/Bundle_ja.properties
index 0900d63..a2370c2 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-php/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-php/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-platform-sdk/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-platform-sdk/data/Bundle_ja.properties
index 6e483f0..979d8e5 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-platform-sdk/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-platform-sdk/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 product.display.name=NetBeans\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0SDK
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-portalpack/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-portalpack/data/Bundle_ja.properties
index 3fc293b..372d1b1 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-portalpack/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-portalpack/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-portalpack/src/org/netbeans/installer/products/nb/portalpack/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-portalpack/src/org/netbeans/installer/products/nb/portalpack/Bundle_ja.properties
index 176304d..a11ae53 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-portalpack/src/org/netbeans/installer/products/nb/portalpack/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-portalpack/src/org/netbeans/installer/products/nb/portalpack/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 cl.error.running.updater=NetBeans\u30a2\u30c3\u30d7\u30c7\u30fc\u30bf\u306e\u5b9f\u884c\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-ruby/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-ruby/data/Bundle_ja.properties
index dc4f9d1..820f25b 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-ruby/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-ruby/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-soa/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-soa/data/Bundle_ja.properties
index 800d230..5129c7f 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-soa/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-soa/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-soa/src/org/netbeans/installer/products/nb/soa/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-soa/src/org/netbeans/installer/products/nb/soa/Bundle_ja.properties
index 33459f2..3757c68 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-soa/src/org/netbeans/installer/products/nb/soa/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-soa/src/org/netbeans/installer/products/nb/soa/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-uml/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-uml/data/Bundle_ja.properties
index 0517334..5852012 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-uml/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-uml/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-uml/src/org/netbeans/installer/products/nb/uml/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-uml/src/org/netbeans/installer/products/nb/uml/Bundle_ja.properties
index e4bb8ed..7cb273e 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-uml/src/org/netbeans/installer/products/nb/uml/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-uml/src/org/netbeans/installer/products/nb/uml/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-webcommon/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-webcommon/data/Bundle_ja.properties
index 9f7c570..0da1db8 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-webcommon/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/nb-webcommon/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 product.display.name=HTML5/JavaScript
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/openesb/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/openesb/data/Bundle_ja.properties
index 02b13ae..e7d0461 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/openesb/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/openesb/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/openesb/src/org/netbeans/installer/products/openesb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/openesb/src/org/netbeans/installer/products/openesb/Bundle_ja.properties
index d3030b4..4472c46 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/openesb/src/org/netbeans/installer/products/openesb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/openesb/src/org/netbeans/installer/products/openesb/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/portletcontainer/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/portletcontainer/data/Bundle_ja.properties
index f91e122..a9f64c3 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/portletcontainer/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/portletcontainer/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/portletcontainer/src/org/netbeans/installer/products/portletcontainer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/portletcontainer/src/org/netbeans/installer/products/portletcontainer/Bundle_ja.properties
index 1b9e85d..b92715b 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/portletcontainer/src/org/netbeans/installer/products/portletcontainer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/portletcontainer/src/org/netbeans/installer/products/portletcontainer/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/data/Bundle_ja.properties
index 76c6d9c..156ae70 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/Bundle_ja.properties
index 462bb85..2a00d57 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/wizard/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/wizard/panels/Bundle_ja.properties
index 830d589..51e7454 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/wizard/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/sjsas/src/org/netbeans/installer/products/sjsas/wizard/panels/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/data/Bundle_ja.properties
index 96db898..5962c41 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/src/org/netbeans/installer/products/tomcat/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/src/org/netbeans/installer/products/tomcat/Bundle_ja.properties
index 190d9ef..66bdc53 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/src/org/netbeans/installer/products/tomcat/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/src/org/netbeans/installer/products/tomcat/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/src/org/netbeans/installer/products/tomcat/wizard/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/src/org/netbeans/installer/products/tomcat/wizard/panels/Bundle_ja.properties
index a2b20a5..f19280a 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/src/org/netbeans/installer/products/tomcat/wizard/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/tomcat/src/org/netbeans/installer/products/tomcat/wizard/panels/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/data/Bundle_ja.properties
index d07ed56..5365b67 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/data/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/src/org/netbeans/installer/products/weblogic/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/src/org/netbeans/installer/products/weblogic/Bundle_ja.properties
index 3b8a144..3a73273 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/src/org/netbeans/installer/products/weblogic/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/src/org/netbeans/installer/products/weblogic/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/src/org/netbeans/installer/products/weblogic/wizard/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/src/org/netbeans/installer/products/weblogic/wizard/panels/Bundle_ja.properties
index cf7f477..9b6c92b 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/src/org/netbeans/installer/products/weblogic/wizard/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/components/products/weblogic/src/org/netbeans/installer/products/weblogic/wizard/panels/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/data/engine_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/data/engine_ja.properties
index ba9ed6b..ffb3231 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/data/engine_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/data/engine_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/native/launcher/windows/i18n/launcher_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/native/launcher/windows/i18n/launcher_ja.properties
index fa441d6..c1b03d7 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/native/launcher/windows/i18n/launcher_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/native/launcher/windows/i18n/launcher_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 nlw.jvm.notfoundmessage=\u3053\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067Java SE Development Kit (JDK)\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\nNetBeans IDE\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u306b\u306fJDK 6\u304c\u5fc5\u8981\u3067\u3059\u3002JDK\u304c\u6b63\u3057\u304f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u3082\u3046\u4e00\u5ea6\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002{0}\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u5f15\u6570\u3092\u4f7f\u7528\u3057\u3066\u3001\u6709\u52b9\u306aJDK\u306e\u5834\u6240\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002\n\nJDK\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u306b\u306f\u3001http://www.oracle.com/technetwork/java/javase/downloads\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
index d25c332..819bb41 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
index b6ccf53..31f93c2 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ###############################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
index fed1786..cfe1d10 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jdk/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/data/engine_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/data/engine_ja.properties
index 6a9f8c8..7ab1f81 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/data/engine_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/data/engine_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/native/launcher/windows/i18n/launcher_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/native/launcher/windows/i18n/launcher_ja.properties
index 7d126d1..341f24b 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/native/launcher/windows/i18n/launcher_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/native/launcher/windows/i18n/launcher_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 nlw.jvm.notfoundmessage=\u3053\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067Java SE Development Kit (JDK)\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\nNetBeans IDE\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u306b\u306fJDK 6\u304c\u5fc5\u8981\u3067\u3059\u3002JDK\u304c\u6b63\u3057\u304f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u3082\u3046\u4e00\u5ea6\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002{0}\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u5f15\u6570\u3092\u4f7f\u7528\u3057\u3066\u3001\u6709\u52b9\u306aJDK\u306e\u5834\u6240\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002\n\nJDK\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u306b\u306f\u3001http://www.oracle.com/technetwork/java/javase/downloads\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
index e65f1e6..b75748d 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
index 8f6eebd..7dde42e 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ###############################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
index 8e9930b..ab7e49b 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/jtb/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/data/engine_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/data/engine_ja.properties
index c750fca..fdde838 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/data/engine_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/data/engine_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/native/launcher/windows/i18n/launcher_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/native/launcher/windows/i18n/launcher_ja.properties
index 8c57359..f76ad23 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/native/launcher/windows/i18n/launcher_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/native/launcher/windows/i18n/launcher_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 nlw.jvm.notfoundmessage=\u3053\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067Java SE Development Kit (JDK)\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\nNetBeans IDE\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u306b\u306fJDK 6\u304c\u5fc5\u8981\u3067\u3059\u3002JDK\u304c\u6b63\u3057\u304f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u3082\u3046\u4e00\u5ea6\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002{0}\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u5f15\u6570\u3092\u4f7f\u7528\u3057\u3066\u3001\u6709\u52b9\u306aJDK\u306e\u5834\u6240\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002\n\nJDK\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u306b\u306f\u3001http://www.oracle.com/technetwork/java/javase/downloads\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
index f5ac1a9..546fc0c 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
index 1ba18ad..ae15bbc 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ###############################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
index 011495f..7779056 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/mysql/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/data/engine_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/data/engine_ja.properties
index b097877..8c196b6 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/data/engine_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/data/engine_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/native/launcher/windows/i18n/launcher_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/native/launcher/windows/i18n/launcher_ja.properties
index 1d7ca1a..655a66c 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/native/launcher/windows/i18n/launcher_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/native/launcher/windows/i18n/launcher_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 nlw.jvm.notfoundmessage=\u3053\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067Java SE Development Kit (JDK)\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\nNetBeans IDE\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u306b\u306fJDK 6\u304c\u5fc5\u8981\u3067\u3059\u3002JDK\u304c\u6b63\u3057\u304f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u3082\u3046\u4e00\u5ea6\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002{0}\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u5f15\u6570\u3092\u4f7f\u7528\u3057\u3066\u3001\u6709\u52b9\u306aJDK\u306e\u5834\u6240\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002\n\nJDK\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u306b\u306f\u3001http://www.oracle.com/technetwork/java/javase/downloads\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
index 5d8d443..0825e5a 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
index a6bebb2..e556856 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ###############################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
index 07037ee..b934d17 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/branding/weblogic/src/org/netbeans/installer/wizard/components/sequences/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/src/data/engine_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/src/data/engine_ja.properties
index 3ee84c4..c8eb98d 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/src/data/engine_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/src/data/engine_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/product/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/product/components/Bundle_ja.properties
index 89a316b..d835017 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/product/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/product/components/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/utils/applications/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/utils/applications/Bundle_ja.properties
index 03d7a2b..514ab8f 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/utils/applications/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/utils/applications/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ############################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
index 90771d4..42d6fd9 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/actions/netbeans/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ###############################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_ja.properties
index e4610a3..7eb270a 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/sequences/netbeans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/sequences/netbeans/Bundle_ja.properties
index 5208df6..27ffed9 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/sequences/netbeans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/engine/src/org/netbeans/installer/wizard/components/sequences/netbeans/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/common_strings_ja.js b/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/common_strings_ja.js
index 10bb747..fc1f1d9 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/common_strings_ja.js
+++ b/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/common_strings_ja.js
@@ -1,40 +1,20 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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-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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 PLATFORM_LONG_NAMES  [0] = "Windows";
diff --git a/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/download_strings_ja.js b/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/download_strings_ja.js
index 98a9255..b1f6778 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/download_strings_ja.js
+++ b/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/download_strings_ja.js
@@ -1,40 +1,20 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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-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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 var BUNDLED_SERVERS_GROUP_NAME = "\u30d0\u30f3\u30c9\u30eb&nbsp;\u30b5\u30fc\u30d0\u30fc";
diff --git a/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/start_strings_ja.js b/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/start_strings_ja.js
index 2dd1918..271e851 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/start_strings_ja.js
+++ b/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/js/start_strings_ja.js
@@ -1,40 +1,20 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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-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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 var AUTOMATIC_DOWNLOAD_MESSAGE  = "\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306f\u81ea\u52d5\u7684\u306b\u59cb\u307e\u308a\u307e\u3059\u3002<br>\u59cb\u307e\u3089\u306a\u3044\u5834\u5408\u306f <a href=\"{0}\" class=\"download_link\">\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u958b\u59cb\u3057\u3066\u304f\u3060\u3055\u3044</a>\u3002<br>";
diff --git a/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/language_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/language_ja.properties
index 9ecc4e2..ab2fd28 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/language_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/infra/build/web/language_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 language.name=\u65e5\u672c\u8a9e
 language.webpage.name=Japanese
 language.id=ja
diff --git a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/Bundle_ja.properties
index 59febc3..27b5d53 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 netbeans-Title=NetBeans ${nb.display.version.long}
 
 jdk-netbeans-Title=Oracle JDK\u3068NetBeans IDE
diff --git a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-cpp_ja.html b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-cpp_ja.html
index e681dcd..96f0e95 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-cpp_ja.html
+++ b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-cpp_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-javaee_ja.html b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-javaee_ja.html
index 57f86ac..20331ce 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-javaee_ja.html
+++ b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-javaee_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-javase_ja.html b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-javase_ja.html
index e7deb31..6b27452 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-javase_ja.html
+++ b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-javase_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_noupdate_ja.html b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_noupdate_ja.html
index b25f630..a58d6f5 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_noupdate_ja.html
+++ b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-jdk_noupdate_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
   <head>
diff --git a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-php_ja.html b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-php_ja.html
index 18df530..3a22a25 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-php_ja.html
+++ b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome-php_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome_ja.html b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome_ja.html
index 1810cac..18a2047 100755
--- a/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome_ja.html
+++ b/netbeans-l10n-zip/src/ja/other/installer/mac/newbuild/dmg/Resources/Welcome_ja.html
@@ -1,42 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/native/launcher/unix/i18n/launcher_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/native/launcher/unix/i18n/launcher_ja.properties
index a533625..4e57c80 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/native/launcher/unix/i18n/launcher_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/native/launcher/unix/i18n/launcher_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 nlu.jvm.notfoundmessage=\u3053\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067Java SE Development Kit (JDK)\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\nNetBeans IDE\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u306b\u306fJDK 8\u304c\u5fc5\u8981\u3067\u3059\u3002JDK\u304c\u6b63\u3057\u304f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u3082\u3046\u4e00\u5ea6\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n{0}\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u5f15\u6570\u3092\u4f7f\u7528\u3057\u3066\u3001\u6709\u52b9\u306aJDK\u306e\u5834\u6240\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002\n\nJDK\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u306b\u306f\u3001http://www.oracle.com/technetwork/java/javase/downloads\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/native/launcher/windows/i18n/launcher_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/native/launcher/windows/i18n/launcher_ja.properties
index 2fd504f..51c41c4 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/native/launcher/windows/i18n/launcher_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/native/launcher/windows/i18n/launcher_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 nlw.jvm.notfoundmessage=\u3053\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067Java SE Development Kit (JDK)\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\nNetBeans IDE\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u306b\u306fJDK 8\u4ee5\u964d\u304c\u5fc5\u8981\u3067\u3059\u3002JDK\u304c\u6b63\u3057\u304f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3092\u3082\u3046\u4e00\u5ea6\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002{0}\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u5f15\u6570\u3092\u4f7f\u7528\u3057\u3066\u3001\u6709\u52b9\u306aJDK\u306e\u5834\u6240\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002\n\nJDK\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u306b\u306f\u3001http://www.oracle.com/technetwork/java/javase/downloads\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/Bundle_ja.properties
index 7a89e1a..974bdfb 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/downloader/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/downloader/Bundle_ja.properties
index 6193c8a..4c59ee2 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/downloader/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/downloader/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/downloader/connector/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/downloader/connector/Bundle_ja.properties
index 887be51..f3a92cb 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/downloader/connector/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/downloader/connector/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/product/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/product/Bundle_ja.properties
index 1837af9..0f32823 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/product/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/product/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 R.loading.local.registry=\u30ed\u30fc\u30ab\u30eb\u30fb\u30ec\u30b8\u30b9\u30c8\u30ea[{0}]\u3092\u30ed\u30fc\u30c9\u4e2d
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/product/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/product/components/Bundle_ja.properties
index 3e0b709..40a1077 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/product/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/product/components/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/Bundle_ja.properties
index f8912fc..d8a61d5 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 LM.error.cannot.write=\u30ed\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u66f8\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30ed\u30b0\u51fa\u529b\u304c\u7121\u52b9\u306b\u306a\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/applications/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/applications/Bundle_ja.properties
index 1759bd4..2d1bc3c 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/applications/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/applications/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 JU.error.verification=JDK\u306e\u691c\u8a3c\u624b\u7d9a\u304d\u306e\u5b9f\u884c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/cli/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/cli/options/Bundle_ja.properties
index 01db48f..33912bd 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/cli/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/cli/options/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/helper/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/helper/Bundle_ja.properties
index 97759e0..3bad862 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/helper/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/helper/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################ 
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/helper/swing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/helper/swing/Bundle_ja.properties
index 075f47d..c7aa820 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/helper/swing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/helper/swing/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/progress/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/progress/Bundle_ja.properties
index f83f3c0..1df21e5 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/progress/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/progress/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/launchers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/launchers/Bundle_ja.properties
index dc7f235..f669f7b 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/launchers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/launchers/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 LP.error.cannot.load.bundle=\u30d0\u30f3\u30c9\u30eb\u3092{0}\u304b\u3089\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/Bundle_ja.properties
index 339f06b..ce43feb 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #############################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/resolver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/resolver/Bundle_ja.properties
index 2bc5d53..111aa7d 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/resolver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/resolver/Bundle_ja.properties
@@ -1,39 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 NR.error.cannot.get.default.apps.location=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5834\u6240\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093
 SR.error.cannot.parse.pattern=\u30d1\u30bf\u30fc\u30f3\u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093: {0}
 
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/windows/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/windows/Bundle_ja.properties
index 7d90cc7..7a520e4 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/windows/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/utils/system/windows/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 WR.error.cannot.access.native=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30e1\u30bd\u30c3\u30c9\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/Bundle_ja.properties
index 50d20a8..236cfa8 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
index de2de98..57fbe73 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/actions/Bundle_ja.properties
index 991deb5..04c0729 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/actions/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/panels/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/panels/Bundle_ja.properties
index ad840f3..091d77d 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/panels/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/components/panels/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/containers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/containers/Bundle_ja.properties
index 4b33c1d..2559312 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/containers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/containers/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/utils/Bundle_ja.properties
index 6b8df85..ee3706d 100755
--- a/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/other/nbi/engine/src/org/netbeans/installer/wizard/utils/Bundle_ja.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #####################################################################################
diff --git a/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/Bundle_ja.properties
index 2104c22..471f741 100755
--- a/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 HudsonJobCreator.buildXml.exist=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30d3\u30eb\u30c9\u30fb\u30b9\u30af\u30ea\u30d7\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u691c\u8a3c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 HudsonJobCreator.button.a11y=Hudson PHP\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u958b\u304d\u307e\u3059\u3002
 HudsonJobCreator.button.labelWithMnemonics=Hudson\u30aa\u30d7\u30b7\u30e7\u30f3(&H)...
diff --git a/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/options/Bundle_ja.properties
index f0dfd95..1acfd6b 100755
--- a/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/options/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 HudsonOptionsValidator.error.buildXml.file=\u30d3\u30eb\u30c9\u30fb\u30b9\u30af\u30ea\u30d7\u30c8
 HudsonOptionsValidator.error.buildXml.name=\u30d5\u30a1\u30a4\u30eb'build.xml'\u3092\u9078\u629e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 HudsonOptionsValidator.error.jobConfig.file=\u30b8\u30e7\u30d6\u69cb\u6210
diff --git a/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/resources/Bundle_ja.properties
index 12c2787..dd1ecf7 100755
--- a/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # general
 OpenIDE-Module-Name=Hudson PHP\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/ui/options/Bundle_ja.properties
index 7bec0a8..8ea5954 100755
--- a/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/hudson-php/hudson-php/org/netbeans/modules/hudson/php/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - file name
 HudsonOptionsPanel.buildXml.browse.filter=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d3\u30eb\u30c9\u30fb\u30b9\u30af\u30ea\u30d7\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb({0})
diff --git a/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/Bundle_ja.properties
index 2ae82d5..380a3ba 100755
--- a/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NeonResolver=Neon\u30d5\u30a1\u30a4\u30eb
 Source=\u30bd\u30fc\u30b9(&S)
 
diff --git a/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/completion/Bundle_ja.properties
index 6df5c94..efb14b4 100755
--- a/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/completion/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ConfigOptRhs=\u69cb\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/resources/Bundle_ja.properties
index bf5d04e..44f3d59 100755
--- a/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u8a00\u8a9e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Long-Description=NEON\u30d5\u30a1\u30a4\u30eb\u306e\u7de8\u96c6\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=NEON\u30d5\u30a1\u30a4\u30eb\u30fb\u30a8\u30c7\u30a3\u30bf\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/resources/NeonFileDescription_ja.html b/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/resources/NeonFileDescription_ja.html
index 8de7780..332bc47 100755
--- a/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/resources/NeonFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/languages-neon/languages-neon/org/netbeans/modules/languages/neon/resources/NeonFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/org-netbeans-libs-javacup/org-netbeans-libs-javacup/org/netbeans/libs/javacup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/org-netbeans-libs-javacup/org-netbeans-libs-javacup/org/netbeans/libs/javacup/Bundle_ja.properties
index 4ab032b..d8f0033 100755
--- a/netbeans-l10n-zip/src/ja/php/org-netbeans-libs-javacup/org-netbeans-libs-javacup/org/netbeans/libs/javacup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/org-netbeans-libs-javacup/org-netbeans-libs-javacup/org/netbeans/libs/javacup/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java CUP\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-annotation/php-api-annotation/org/netbeans/modules/php/api/annotation/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-annotation/php-api-annotation/org/netbeans/modules/php/api/annotation/resources/Bundle_ja.properties
index 2f01d31..563607d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-annotation/php-api-annotation/org/netbeans/modules/php/api/annotation/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-annotation/php-api-annotation/org/netbeans/modules/php/api/annotation/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u6ce8\u91c8\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/resources/Bundle_ja.properties
index c41c844..9325e20 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30c4\u30fc\u30eb\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/ui/actions/Bundle_ja.properties
index bd4be2c..2637bde 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/ui/actions/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 GenerateDocumentationActionFactory.title=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u751f\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/ui/customizer/Bundle_ja.properties
index 6a50bf9..13d9b2f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-documentation/php-api-documentation/org/netbeans/modules/php/api/documentation/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CompositeCategoryProviderImpl.documentation.title=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
 CustomizerDocumentation.providerLabel.text=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0(&D):
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-editor/php-api-editor/org/netbeans/modules/php/api/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-editor/php-api-editor/org/netbeans/modules/php/api/editor/resources/Bundle_ja.properties
index 09b5484..02055a5 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-editor/php-api-editor/org/netbeans/modules/php/api/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-editor/php-api-editor/org/netbeans/modules/php/api/editor/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u30a8\u30c7\u30a3\u30bf\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-executable/php-api-executable/org/netbeans/modules/php/api/executable/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-executable/php-api-executable/org/netbeans/modules/php/api/executable/Bundle_ja.properties
index de203ae..88817cf 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-executable/php-api-executable/org/netbeans/modules/php/api/executable/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-executable/php-api-executable/org/netbeans/modules/php/api/executable/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 InfoInputProcessor.done=\u5b8c\u4e86\u3002
 PhpExecutable.debug.noMoreSessions=\u30c7\u30d0\u30c3\u30ac\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u3059\u3067\u306b\u5b9f\u884c\u4e2d\u3067\u3059\u3002\u518d\u8d77\u52d5\u3057\u307e\u3059\u304b?
 PhpExecutable.debug.progress=\u30c7\u30d0\u30c3\u30b0\u4e2d...
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-executable/php-api-executable/org/netbeans/modules/php/api/executable/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-executable/php-api-executable/org/netbeans/modules/php/api/executable/resources/Bundle_ja.properties
index aa445b1..54bdeac 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-executable/php-api-executable/org/netbeans/modules/php/api/executable/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-executable/php-api-executable/org/netbeans/modules/php/api/executable/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u306eAPI(\u69d8\u3005\u306aPHP\u30b9\u30af\u30ea\u30d7\u30c8\u3068\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u30b5\u30dd\u30fc\u30c8)\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/api/framework/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/api/framework/resources/Bundle_ja.properties
index 62c28e8..bb6aa4b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/api/framework/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/api/framework/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/api/framework/ui/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/api/framework/ui/commands/Bundle_ja.properties
index bdd7748..00eb6db 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/api/framework/ui/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/api/framework/ui/commands/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # task chooser
 LBL_PleaseWait=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/spi/framework/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/spi/framework/actions/Bundle_ja.properties
index aabbe77..683a6f6 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/spi/framework/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-framework/php-api-framework/org/netbeans/modules/php/spi/framework/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_GoToAction=\u30a2\u30af\u30b7\u30e7\u30f3\u306b\u79fb\u52d5
 LBL_GoToView=\u30d3\u30e5\u30fc\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/Bundle_ja.properties
index ef75552..747f5dd 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 PhpVersion.PHP_5=PHP 5.2/5.1
 PhpVersion.PHP_53=PHP 5.3
 PhpVersion.PHP_54=PHP 5.4
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/phpmodule/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/phpmodule/Bundle_ja.properties
index cb1b776..709a68d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/phpmodule/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/phpmodule/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CreatePropertiesValidator.error.charset=\u6587\u5b57\u30bb\u30c3\u30c8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 CreatePropertiesValidator.error.name=\u540d\u524d\u304c\u7121\u52b9\u3067\u3059\u3002
 CreatePropertiesValidator.error.phpVersion=PHP\u30d0\u30fc\u30b8\u30e7\u30f3\u304c\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/phpmodule/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/phpmodule/resources/Bundle_ja.properties
index 286cd88..53ed36d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/phpmodule/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/phpmodule/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u30e2\u30b8\u30e5\u30fc\u30eb\u958b\u767a\u30b5\u30dd\u30fc\u30c8\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u7528\u306eAPI(\u69d8\u3005\u306aWeb\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3001\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u30b5\u30dd\u30fc\u30c8\u306a\u3069)\u3002
 OpenIDE-Module-Name=PHP\u30e2\u30b8\u30e5\u30fc\u30ebAPI
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/ui/Bundle_ja.properties
index 0824e33..e8ad447 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # search php interpreter
 LBL_PleaseWait=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u3002{0} \u3092\u691c\u7d22\u4e2d...
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/ui/options/Bundle_ja.properties
index 103b7db..0a0a383 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_FrameworksTabTitle=\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u304a\u3088\u3073\u30c4\u30fc\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/util/Bundle_ja.properties
index 45cbcb4..f7d6d13 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-phpmodule/php-api-phpmodule/org/netbeans/modules/php/api/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FileUtils.validateDirectory.directory=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
 # {0} - source
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-templates/php-api-templates/org/netbeans/modules/php/api/templates/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-templates/php-api-templates/org/netbeans/modules/php/api/templates/resources/Bundle_ja.properties
index eafd22c..18a630e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-templates/php-api-templates/org/netbeans/modules/php/api/templates/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-templates/php-api-templates/org/netbeans/modules/php/api/templates/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-testing/php-api-testing/org/netbeans/modules/php/api/testing/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-testing/php-api-testing/org/netbeans/modules/php/api/testing/resources/Bundle_ja.properties
index a37cbd8..559fdc9 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-testing/php-api-testing/org/netbeans/modules/php/api/testing/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-testing/php-api-testing/org/netbeans/modules/php/api/testing/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-api-testing/php-api-testing/org/netbeans/modules/php/spi/testing/create/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-api-testing/php-api-testing/org/netbeans/modules/php/spi/testing/create/Bundle_ja.properties
index b27decc..0ac6325 100755
--- a/netbeans-l10n-zip/src/ja/php/php-api-testing/php-api-testing/org/netbeans/modules/php/spi/testing/create/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-api-testing/php-api-testing/org/netbeans/modules/php/spi/testing/create/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CreateTestsSupport.creating=\u30c6\u30b9\u30c8\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059...
 # {0} - file names
 CreateTestsSupport.failed=\u30c6\u30b9\u30c8\u306f\u3001\u6b21\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u306f\u751f\u6210\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f:\n\n{0}\n\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/Bundle_ja.properties
index 272a8ad..9ccaacf 100755
--- a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ApiGenProvider.name=ApiGen
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/commands/Bundle_ja.properties
index bce7536..56a7b37 100755
--- a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 ApiGenScript.api.generating=ApiGen ({0})
 ApiGenScript.script.label=ApiGen\u30b9\u30af\u30ea\u30d7\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/resources/Bundle_ja.properties
index 751307d..93b82c3 100755
--- a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module
 OpenIDE-Module-Display-Category=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/Bundle_ja.properties
index ca97723..5d17623 100755
--- a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2011 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BrowseFolderPanel.dir.select=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e
 # {0} - project name
diff --git a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/customizer/Bundle_ja.properties
index f048f17..20920a6 100755
--- a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ApiGenPanel.config.title=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u69cb\u6210\u3092\u9078\u629e
 ApiGenPanel.deprecated.toolTip=\u975e\u63a8\u5968\u8981\u7d20\u5411\u3051\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u751f\u6210\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/options/Bundle_ja.properties
index e6337cb..5d46712 100755
--- a/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-apigen/php-apigen/org/netbeans/modules/php/apigen/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2011 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - short script name
 # {1} - long script name
diff --git a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/Bundle_ja.properties
index 1371e0c..bee50f3 100755
--- a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AtoumTestingProvider.name=atoum
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/commands/Bundle_ja.properties
index f078ec1..9cab824 100755
--- a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 Atoum.run.title=atoum ({0})
 ParsingProcessor.message.no=<\u30e1\u30c3\u30bb\u30fc\u30b8\u306a\u3057>
diff --git a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/create/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/create/Bundle_ja.properties
index e5606b6..1173717 100755
--- a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/create/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/create/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AtoumTestCreatorProvider.name=atoum
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/preferences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/preferences/Bundle_ja.properties
index bf1aea1..d48840f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/preferences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/preferences/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AtoumPreferencesValidator.bootstrap.label=\u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7
 AtoumPreferencesValidator.configuration.label=\u69cb\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/resources/Bundle_ja.properties
index e6dac00..917f192 100755
--- a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module
 OpenIDE-Module-Display-Category=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/ui/customizer/Bundle_ja.properties
index c37fdae..51de3e4 100755
--- a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2013 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AtoumCustomizer.name=atoum
 # customizer
diff --git a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/ui/options/Bundle_ja.properties
index f71fab2..ef49c7f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AtoumOptionsPanel.atoum.browse.title=atoum\u306e\u9078\u629e
 # {0} - phar file name
diff --git a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/util/Bundle_ja.properties
index cc7b6af..dad607d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-atoum/php-atoum/org/netbeans/modules/php/atoum/util/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AtoumUtils.atoum.label=atoum\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/Bundle_ja.properties
index 9e1fafd..8f47dea 100755
--- a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CodeSnifferAnalyzerFactory.displayName=Code Sniffer
 CodeSnifferAnalyzerImpl.analyze.error=Code Sniffer\u5206\u6790\u30a8\u30e9\u30fc
 CodeSnifferAnalyzerImpl.analyze.error.description=Code Sniffer\u5206\u6790\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u8a73\u7d30\u306f\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/commands/Bundle_ja.properties
index e553120..2dcfc72 100755
--- a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - counter
 CodeSniffer.analyze=Code Sniffer (\u5206\u6790#{0})
 CodeSniffer.listStandards=Code Sniffer (\u6a19\u6e96)
diff --git a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/options/Bundle_ja.properties
index 1c4249a..3d4913b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/options/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AnalysisOptionsValidator.codeSniffer.standard.empty=\u6709\u52b9\u306aCode Sniffer\u6a19\u6e96\u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 AnalysisOptionsValidator.messDetector.ruleSets.empty=\u5c11\u306a\u304f\u3068\u30821\u3064\u306e\u30eb\u30fc\u30eb\u30fb\u30bb\u30c3\u30c8\u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/resources/Bundle_ja.properties
index 25898d6..e8ef3be 100755
--- a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u30d5\u30a1\u30a4\u30eb\u306e\u9759\u7684\u5206\u6790\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/Bundle_ja.properties
index b6fc5e8..06a1e08 100755
--- a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CodeSnifferStandardsComboBoxModel.standards.fetching=<\u6a19\u6e96\u3092\u30d5\u30a7\u30c3\u30c1\u4e2d...>
 CodeSnifferStandardsComboBoxModel.standards.none=<\u4f7f\u7528\u53ef\u80fd\u306a\u6a19\u6e96\u304c\u3042\u308a\u307e\u305b\u3093>
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/analyzer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/analyzer/Bundle_ja.properties
index af1b319..1385402 100755
--- a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/analyzer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/analyzer/Bundle_ja.properties
@@ -1,43 +1,19 @@
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2013 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # code sniffer
 CodeSnifferCustomizerPanel.standardLabel.text=\u6a19\u6e96(&T):
diff --git a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/options/Bundle_ja.properties
index c186f9b..96fb3cd 100755
--- a/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-code-analysis/php-code-analysis/org/netbeans/modules/php/analysis/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AnalysisOptionsPanel.keywords.analysis=\u5206\u6790
 # main panel
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/Bundle_ja.properties
index 527bd0c..8103408 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CodeceptionTestingProvider.displayName=Codeception
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/annotations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/annotations/Bundle_ja.properties
index 751a782..596edcd 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/annotations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/annotations/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CodeceptionAnnotationsProvider.name=Codeception
 EnvTag.documentation=<p style="font-weight: bold; font-size: 1.2em">@env</p><p style="font-weight: bold; font-size: 1.1em">\u8aac\u660e</p><p>\u671b\u307e\u3057\u3044\u74b0\u5883\u306f\u3001\u30c6\u30b9\u30c8\u306e<code>@env</code>\u6ce8\u91c8\u3067Test and Cest\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u6307\u5b9a\u3067\u304d\u307e\u3059</p><p style="font-weight: bold; font-size: 1.1em">\u4f8b</p><pre><code>\n/**\n * This test will be executed only in 'firefox' and 'phantom' environments\n *\n * @env firefox\n * @env phantom\n */\npublic function webkitOnlyTest(AcceptanceTester $I)\n{\n    // I do something\n}\n</code></pre>
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/commands/Bundle_ja.properties
index b0388e7..75624b2 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 Codecept.displayName=Codecept ({0})
 Codecept.file.exists=codeception.yml\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/create/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/create/Bundle_ja.properties
index 8011a21..e6d10a6 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/create/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/create/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CodeceptionTestCreatorConfiguration.error.suites.none=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u9069\u5408\u3059\u308b\u30c6\u30b9\u30c8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 CodeceptionTestCreatorProvider.name=Codeception
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/preferences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/preferences/Bundle_ja.properties
index f678325..eb5dd41 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/preferences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/preferences/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CodeceptionPreferencesValidator.incorrect.codeception.yml.fileName=codeception.yml\u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/resources/Bundle_ja.properties
index ddffc76..ff20277 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module
 OpenIDE-Module-Display-Category=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/run/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/run/Bundle_ja.properties
index c470eab..957088f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/run/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/run/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TestCaseVo.tests.no=\u6709\u52b9\u306a\u30c6\u30b9\u30c8\u30fb\u30b1\u30fc\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 TestSessionVo.msg.output=\u5b8c\u5168\u306a\u51fa\u529b\u306f\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u3042\u308a\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/Bundle_ja.properties
index af25f33..6e26935 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/Bundle_ja.properties
@@ -1,42 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-# Copyright 2015 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
 CodeceptionCreateTestPanel.commandLabel.text=\u30b3\u30de\u30f3\u30c9(&M):
 CodeceptionCreateTestPanel.suiteLabel.text=\u30b9\u30a4\u30fc\u30c8(&S):
 CodeceptRunParametersPanel.dialog.title=\u8ffd\u52a0\u30d1\u30e9\u30e1\u30fc\u30bf
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/actions/Bundle_ja.properties
index dede766..e8d8c55 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BaseCodeceptionAction.error.codeception.notValid=Codeception\u306f\u6709\u52b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 BootstrapAction.name=\u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7
 BuildAction.name=\u30d3\u30eb\u30c9
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/customizer/Bundle_ja.properties
index 9a4dc91..ddbbd22 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CodeceptionCustomizer.name=Codeception
 CustomizerCodeception.chooser.codecept=Codecept\u30b9\u30af\u30ea\u30d7\u30c8\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/options/Bundle_ja.properties
index 1d058d0..0003971 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CodeceptionOptionsPanel.browseButton.text=\u53c2\u7167(&B)...
 CodeceptionOptionsPanel.codeception.browse.title=codecept\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/util/Bundle_ja.properties
index 554d0ff..96a0f18 100755
--- a/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-codeception/php-codeception/org/netbeans/modules/php/codeception/util/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CodeceptionUtils.codeception.label=Codecept\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/Bundle_ja.properties
index 858f7de..944f6a1 100755
--- a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PhpModuleExtenderImpl.displayName=Composer
 # {0} - error message
diff --git a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/commands/Bundle_ja.properties
index fa2fb36..d8fcd82 100755
--- a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Composer.file.exists=Composer.json\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059 - \u4e0a\u66f8\u304d\u3057\u307e\u3059\u304b\u3002
 # {0} - project name
 Composer.init.description=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306e\u8aac\u660e\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/mimeresolver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/mimeresolver/Bundle_ja.properties
index 08b7654..4d55849 100755
--- a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/mimeresolver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/mimeresolver/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # mimeresolver
 LBL_ComposerLockFile=PHP Composer\u30ed\u30c3\u30af\u30fb\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/options/Bundle_ja.properties
index abb6ed6..8ea2441 100755
--- a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/options/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ComposerOptionsValidator.warning.authorNameNumber=\u4f5c\u6210\u8005\u540d\u306f\u6570\u5024\u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
 ComposerOptionsValidator.warning.invalidAuthorEmail=\u4f5c\u6210\u8005\u306e\u96fb\u5b50\u30e1\u30fc\u30eb\u304c\u7121\u52b9\u3067\u3059\u3002
 ComposerOptionsValidator.warning.invalidVendor=\u30d9\u30f3\u30c0\u30fc\u306f\u7121\u52b9\u3067\u3059(\u5c0f\u6587\u5b57\u304a\u3088\u3073"-"\u306e\u307f\u4f7f\u7528\u3067\u304d\u307e\u3059)
diff --git a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/resources/Bundle_ja.properties
index c144064..16d01fe 100755
--- a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module
 OpenIDE-Module-Display-Category=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/Bundle_ja.properties
index ca56781..ddb9e60 100755
--- a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - library description
 # {1} - library type
diff --git a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/actions/Bundle_ja.properties
index a386bc1..1c5d281 100755
--- a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # actions menu
 ActionsFactory.name=Composer
diff --git a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/options/Bundle_ja.properties
index 9eba77a..b92e8f4 100755
--- a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ComposerOptionsPanel.browse.title=Composer\u30b9\u30af\u30ea\u30d7\u30c8\u306e\u9078\u629e
 # {0} - short script name
diff --git a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/util/Bundle_ja.properties
index f0e8034..cf5f87e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-composer/php-composer/org/netbeans/modules/php/composer/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
 # when composer UI for adding dependency is used
diff --git a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/Bundle_ja.properties
index dea79c8..9f6b1e6 100755
--- a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_ErrDebugSession=xdebug\u304b\u3089\u306e\u63a5\u7d9a\u304c{0}\u79d2\u4ee5\u5185\u306b\u691c\u51fa\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002<b>xdebug\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u306a\u3044\u304b\u9069\u5207\u306b\u69cb\u6210\u3055\u308c\u3066\u3044\u306a\u3044</b>\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002php.ini\u30d5\u30a1\u30a4\u30eb\u306b\u6b21\u306e\u30a8\u30f3\u30c8\u30ea\u304c\u542b\u307e\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044: {1}
 #don't translate this - it's a configuration directive name
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/annotations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/annotations/Bundle_ja.properties
index 09ae693..98ca87b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/annotations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/annotations/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DebuggerAnnotation
 ANTN_DISABLED_CONDITIONAL_BREAKPOINT=\u7121\u52b9\u306a\u6761\u4ef6\u4ed8\u304d\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/breakpoints/Bundle_ja.properties
index 7c368d8..4ef8109 100755
--- a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #BreakpointsActionsProvider
 CTL_Breakpoint_GoToSource_Label=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/models/Bundle_ja.properties
index c7bf58d..429472a 100755
--- a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/models/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #
 #LocalViewActionProvider
diff --git a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/models/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/models/nodes/Bundle_ja.properties
index d59d969..f515288 100755
--- a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/models/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/models/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 WatchesAndEvalDisabled=\u30a6\u30a9\u30c3\u30c1\u3068\u8a55\u4fa1\u306f\u7121\u52b9\u306b\u306a\u3063\u3066\u3044\u307e\u3059(\u300c\u30c4\u30fc\u30eb\u300d-\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u3067PHP\u3092\u53c2\u7167)\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/packets/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/packets/Bundle_ja.properties
index 97bc0ba..aa1dea5 100755
--- a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/packets/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/packets/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DbgpMessage.packet.error=Xdebug\u3068\u901a\u4fe1\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\n\n\u554f\u984c\u3092\u30ec\u30dd\u30fc\u30c8\u3057\u3001\u518d\u73fe\u3059\u308b\u305f\u3081\u306e\u30b9\u30c6\u30c3\u30d7\u3092\u8a18\u8f09\u3057\u3066\u3001\u7406\u60f3\u7684\u306b\u306fXdebug\u30ed\u30b0\u3068\u3068\u3082\u306bIDE\u3092\u6dfb\u4ed8\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n(xdebug.remote_log=/log_path/xdebug.log\u3092php.ini\u306b\u8ffd\u52a0\u3057\u307e\u3059\u3002)
 ERR_PacketError=\u30ea\u30e2\u30fc\u30c8\u30fb\u30c7\u30d0\u30c3\u30ac\u304b\u3089\u4e88\u671f\u3057\u306a\u3044\u30c7\u30fc\u30bf\u3092\u53d7\u3051\u53d6\u308a\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/resources/Bundle_ja.properties
index 2d16ab8..3fdcefe 100755
--- a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=XDebug\u7528\u306bDBGP\u30d7\u30ed\u30c8\u30b3\u30eb\u3092\u5b9f\u88c5\u3059\u308bPHP\u30c7\u30d0\u30c3\u30ac\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/ui/Bundle_ja.properties
index 7f59d7a..8ee11f8 100755
--- a/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-dbgp/php-dbgp/org/netbeans/modules/php/dbgp/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Settings=\u8a2d\u5b9a
 LBL_MethodName=\u30e1\u30bd\u30c3\u30c9\u540d(&M):
diff --git a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/Bundle_ja.properties
index edec531..ec5bb02 100755
--- a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_FrameworkDescription=Doctrine2 PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 LBL_FrameworkName=Doctrine2 PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/commands/Bundle_ja.properties
index 0ec457f..ad9a4d5 100755
--- a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 Doctrine2Script.command.title=Doctrine2 ({0})
 Doctrine2Script.script.label=Doctrine2\u30b9\u30af\u30ea\u30d7\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/resources/Bundle_ja.properties
index d8ba1d0..fdfd263 100755
--- a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=Doctrine2\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/actions/Bundle_ja.properties
index 1c5623e..10acff1 100755
--- a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - command name
 LBL_Doctrine2Action=Doctrine2: {0}
 LBL_MenuName=Doctrine2
diff --git a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/customizer/Bundle_ja.properties
index 863bc79..b81839e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # customizer panel
 Doctrine2CustomizerPanel.enabledCheckBox.text=\u6709\u52b9(&E)
diff --git a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/options/Bundle_ja.properties
index 1e75cf4..983e151 100755
--- a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Doctrine2.options.keywords.TabTitle=\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u304a\u3088\u3073\u30c4\u30fc\u30eb
 # {0} - short script name
diff --git a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/wizards/Bundle_ja.properties
index 030ea1c..a16f1c4 100755
--- a/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-doctrine2/php-doctrine2/org/netbeans/modules/php/doctrine2/ui/wizards/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # new project panel
 NewProjectConfigurationPanel.optionsLabel.text=<html><a href="#">\u30aa\u30d7\u30b7\u30e7\u30f3...</a></html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/Bundle_ja.properties
index 3e08c44..6e7ed62 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_DOWNLOAD_PHPDOC_DOCUMENTATION=PHP\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u751f\u6210\u6a5f\u80fd\u306e\u30bf\u30b0\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u3001\u81ea\u52d5\u66f4\u65b0\u30bb\u30f3\u30bf\u30fc\u3067\u5229\u7528\u3067\u304d\u307e\u3059\u3002<br/><br/>\u300c\u30c4\u30fc\u30eb\u300d>\u300c\u30d7\u30e9\u30b0\u30a4\u30f3\u300d>\u300c\u4f7f\u7528\u53ef\u80fd\u306a\u30d7\u30e9\u30b0\u30a4\u30f3\u300d\u306b\u79fb\u52d5\u3057\u3001PHP\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u751f\u6210\u6a5f\u80fd\u30bf\u30b0\u30fb\u30d8\u30eb\u30d7\u30fb\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/actions/Bundle_ja.properties
index 9dee720..010e7dd 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CanNotBeResolved=<html><font color='#FF0000'>&lt;\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093&gt;
 complete-line=\u884c\u3092\u5b8c\u4e86
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/Bundle_ja.properties
index d81d3eb..46c42c4 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# 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 enLBL_TITLE_GETTERS_AND_SETTERSclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ConnectionToDatabase=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3078\u306e\u63a5\u7d9a...
 LBL_DatabaseTable=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u8868...
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/ui/Bundle_ja.properties
index adc80bd..8fcca44 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/codegen/ui/Bundle_ja.properties
@@ -1,42 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-# 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
 TableGeneratorPanel.tableLabel.text=\u8868(&T):
 TableGeneratorPanel.columnLabel.text=\u5217(&C):
 TableGeneratorPanel.connVariableLabel.text=\u63a5\u7d9a\u5909\u6570(&V):
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/completion/Bundle_ja.properties
index 00a02cb..5786af1 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/completion/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Description=\u8aac\u660e
 Generate=- \u751f\u6210
 LBL_LANGUAGE_CONSTRUCT=\u8a00\u8a9e\u69cb\u9020
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/csl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/csl/Bundle_ja.properties
index bd1d148..c4246c0 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/csl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/csl/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 FT_Classes=\u30af\u30e9\u30b9
 FT_Functions=\u95a2\u6570\u3068\u30e1\u30bd\u30c3\u30c9
 FT_PHPDoc=PHPDoc\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/elements/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/elements/Bundle_ja.properties
index 3e9d119..6ce1c02 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/elements/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/elements/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - Class name
 IllegalArgument=\u5b8c\u5168\u4fee\u98fe\u540d\u306e\u307f\u3092{0}\u3067\u89e3\u6c7a\u3067\u304d\u307e\u3059
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/Bundle_ja.properties
index fd32a29..f387056 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Formating options
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/ui/Bundle_ja.properties
index 1abfcb6..0bc00e7 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/indent/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Formating options
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/index/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/index/Bundle_ja.properties
index a147eae..7fafd44 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/index/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/index/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 PHPResolver=PHP\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/nav/hierarchy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/nav/hierarchy/Bundle_ja.properties
index 1215a1a..3aed47a 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/nav/hierarchy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/nav/hierarchy/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_HierarchyTopComponent=PHP\u968e\u5c64
 HINT_HierarchyTopComponent=PHP\u968e\u5c64\u30d3\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/options/Bundle_ja.properties
index dcdecae..51cd169 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_OnOff_CheckBox=\u30ad\u30e3\u30ec\u30c3\u30c8\u306e\u4e0b\u306b\u3042\u308b\u30b7\u30f3\u30dc\u30eb\u306e\u51fa\u73fe\u3092\u30de\u30fc\u30af(&O)
 ACSD_OnOff_CB=\u30de\u30fc\u30af\u51fa\u73fe\u306e\u30aa\u30f3/\u30aa\u30d5\u3092\u5207\u66ff\u3048\u308b\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/palette/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/palette/Bundle_ja.properties
index 239e465..bd4d46e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/palette/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/palette/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ErrorNoFocusedDocument=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u3053\u306e\u9805\u76ee\u3092\u633f\u5165\u3059\u308b\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 ACT_OpenPHPCustomizer=\u30b3\u30fc\u30c9\u30fb\u30af\u30ea\u30c3\u30d7(&C)
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/parser/Bundle_ja.properties
index b4a0435..e685589 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/parser/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_FatalError=\u30d5\u30a1\u30a4\u30eb\u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 SE_After=\u5f8c
 SE_EOF=\u30d5\u30a1\u30a4\u30eb\u306e\u7d42\u4e86
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/resources/Bundle_ja.properties
index fd4f237..76aa1af 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Display-Category=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/sql/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/sql/Bundle_ja.properties
index 60559bb..025ec3f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/sql/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/sql/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 Type=\u30bf\u30a4\u30d7
 SelectDatabaseConnection=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u3092\u9078\u629e...
 select-connection=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/sql/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/sql/ui/Bundle_ja.properties
index b504714..fb3a0e5 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/sql/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/sql/ui/Bundle_ja.properties
@@ -1,42 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-# 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
 ChooseConnectionPanel.dbconnComboBox.AccessibleContext.accessibleName=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a
 ChooseConnectionPanel.dbconnComboBox.AccessibleContext.accessibleDescription=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u306e\u4e00\u89a7
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/verification/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/verification/Bundle_ja.properties
index 828a760..79fa331 100755
--- a/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/verification/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-editor/php-editor/org/netbeans/modules/php/editor/verification/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AbstractClassFixDesc=\u62bd\u8c61\u30af\u30e9\u30b9\u3092\u5ba3\u8a00
 # {0} - Class name
 AbstractClassInstantiationDesc=\u62bd\u8c61\u30af\u30e9\u30b9{0}\u306f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u3067\u304d\u307e\u305b\u3093
@@ -8,47 +25,6 @@
 AbstractPrivateMethod=\u62bd\u8c61\u30e1\u30bd\u30c3\u30c9"{0}"\u306fprivate\u3068\u5ba3\u8a00\u3067\u304d\u307e\u305b\u3093
 # {0} - Method name
 AbstractWithBlockMethod=\u62bd\u8c61\u30e1\u30bd\u30c3\u30c9"{0}"\u306b\u672c\u4f53\u3092\u542b\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
-# 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.
 AccidentalAssignmentCustomizer.includeWhileCB.text='while'\u6587\u5185\u306e\u4ee3\u5165\u3092\u78ba\u8a8d\u3059\u308b
 AccidentalAssignmentCustomizer.AccessibleContext.accessibleDescription=\u4ee3\u5165\u3092\u7121\u8996\u3059\u308b/\u542b\u3081\u308b\u8a2d\u5b9a\u306e\u7de8\u96c6
 AccidentalAssignmentCustomizer.AccessibleContext.accessibleName=\u4ee3\u5165\u8a2d\u5b9a\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/php/php-kit/php-kit/org/netbeans/modules/php/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-kit/php-kit/org/netbeans/modules/php/kit/Bundle_ja.properties
index 7f8c86a..aec9641 100755
--- a/netbeans-l10n-zip/src/ja/php/php-kit/php-kit/org/netbeans/modules/php/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-kit/php-kit/org/netbeans/modules/php/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u958b\u767a\u306e\u30c4\u30fc\u30eb\u3068\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\nPHP\u30a8\u30c7\u30a3\u30bf\u3001\u30c7\u30d0\u30c3\u30ac\u3001\u30b5\u30f3\u30d7\u30eb\u304a\u3088\u3073\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u542b\u307e\u308c\u307e\u3059\u3002
 OpenIDE-Module-Name=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/Bundle_ja.properties
index 5e2f7ed..717af93 100755
--- a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LatteResolver=Latte\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 LBL_Latte_EDITOR=\u30bd\u30fc\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/completion/Bundle_ja.properties
index 9354330..7139ef7 100755
--- a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #####< Documentation of latte macros, helpers and keywords >#####
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/hints/Bundle_ja.properties
index 8112555..f6bb28c 100755
--- a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/hints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 csl-hints/text/x-latte/hints/deprecatedmacros=\u975e\u63a8\u5968\u306e\u30de\u30af\u30ed
 CTL_Hints_DisplayName=\u30d2\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/parser/Bundle_ja.properties
index 157d9f2..0682f3f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/parser/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - macro name
 ERR_UnclosedMacro=\u7d42\u4e86\u3057\u3066\u3044\u306a\u3044\u30de\u30af\u30ed: {0}
 # {0} - macro name
diff --git a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/Bundle_ja.properties
index 4ba22cd..efed5f7 100755
--- a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u306eLatte\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30fb\u30a8\u30f3\u30b8\u30f3\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/LatteFileDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/LatteFileDescription_ja.html
index 6bd5c9a..f680d0d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/LatteFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-latte/php-latte/org/netbeans/modules/php/latte/resources/LatteFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/Bundle_ja.properties
index 2d4a1a5..1226bee 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TesterTestingProvider.name=Nette Tester
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/commands/Bundle_ja.properties
index 94e5009..df3cc66 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ParsingProcessor.failure.unknown=\u4e0d\u660e\u306a\u5931\u6557
 # {0} - project name
 Tester.run.title=Nette Tester({0})
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/create/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/create/Bundle_ja.properties
index b173196..717f797 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/create/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/create/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TesterTestCreatorProvider.name=Nette Tester
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/resources/Bundle_ja.properties
index 36d2f5b..caa85ec 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module
 OpenIDE-Module-Display-Category=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/run/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/run/Bundle_ja.properties
index e07a252..8318c91 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/run/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/run/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TestSuiteVo.name=\u30c6\u30b9\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/customizer/Bundle_ja.properties
index 7632bea..c515e78 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CustomizerTester.chooser.coverage.src.path=\u30ab\u30d0\u30ec\u30fc\u30b8\u306e\u30bd\u30fc\u30b9\u30fb\u30d1\u30b9\u306e\u9078\u629e
 CustomizerTester.chooser.php.ini=php.ini\u306e\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30d5\u30a9\u30eb\u30c0\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/options/Bundle_ja.properties
index 806e193..fc73a9a 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # options
 TesterOptionsPanel.name=Nette Tester
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/resources/Bundle_ja.properties
index 8541b06..4a28ac0 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/ui/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Templates.nette.tester.template.displayName=Nette Tester\u30c6\u30b9\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/util/Bundle_ja.properties
index bd0e118..0554098 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette-tester/php-nette-tester/org/netbeans/modules/php/nette/tester/util/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TesterUtils.coverage.source.path.error=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3078\u306e\u7d76\u5bfe\u30d1\u30b9\u3092\u30ab\u30d0\u30ec\u30fc\u30b8\u30fb\u30bd\u30fc\u30b9\u30fb\u30d1\u30b9\u306b\u3064\u3044\u3066\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 TesterUtils.php.ini.error=\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3078\u306e\u7d76\u5bfe\u30d1\u30b9\u3092php.ini\u306b\u3064\u3044\u3066\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 TesterUtils.tester.label=Tester\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/Bundle_ja.properties
index 9a7a99c..3c07b27 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_FrameworkDescription=Nette2 PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 LBL_FrameworkName=Nette2 PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/annotations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/annotations/Bundle_ja.properties
index ce5caf0..1af38ed 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/annotations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/annotations/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Nette2AnnotationsDescription=Nette2\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u6ce8\u91c8
 Nette2AnnotationsName=Nette2
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/codegen/Bundle_ja.properties
index e9f3e1a..e1b8d85 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/codegen/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_ActionRenderCodeGeneratorName=\u30a2\u30af\u30b7\u30e7\u30f3\u307e\u305f\u306f\u63cf\u753b\u30e1\u30bd\u30c3\u30c9(\u3042\u308b\u3044\u306f\u305d\u306e\u4e21\u65b9)...
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/resources/Bundle_ja.properties
index 907645b..168b44e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=Nette2\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/codegen/Bundle_ja.properties
index 26f37f2..047aa9c 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/codegen/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ActionRenderVisualPanel.deleteButton.text=\u524a\u9664(&D)
 
 ActionRenderVisualPanel.addButton.text=\u8ffd\u52a0(&A)
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/customizer/Bundle_ja.properties
index af7c820..3e1be1f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/customizer/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_CustomizerDisplayName=Nette2
 Nette2CustomizerPanel.enabledCheckBox.text=\u6709\u52b9(&E)
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/options/Bundle_ja.properties
index 4b4e69c..9cd91c3 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Nette2OptionsName=Nette2
 LBL_SelectNetteDirectory=Nette\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/wizards/Bundle_ja.properties
index 75f0ac3..f485324 100755
--- a/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-nette2/php-nette2/org/netbeans/modules/php/nette2/ui/wizards/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NewNette2ProjectPanel.optionsLabel.text=<html><a href="#">\u30aa\u30d7\u30b7\u30e7\u30f3...</a></html>
 NewNette2ProjectPanel.copyNetteCheckBox.text=Nette\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u30fb\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u65b0\u898f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3059\u304b\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/Bundle_ja.properties
index 7373363..ab2fd4f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 PhingBuildTool.configure=Phing\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u547c\u3073\u51fa\u3059\u3088\u3046\u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u69cb\u6210\u3057\u307e\u3059\u304b\u3002
 PhingBuildTool.name=Phing
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/exec/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/exec/Bundle_ja.properties
index 52a62f2..5baf889 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/exec/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/exec/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 PhingExecutable.run=Phing ({0})
 TargetList.error=Phing\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/options/Bundle_ja.properties
index b947a9f..44a5b31 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/options/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 PhingOptionsValidator.phing.name=Phing
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/resources/Bundle_ja.properties
index 965ad2c..626af2e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=Phing\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/actions/Bundle_ja.properties
index e9a88d4..4d6711b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 RunPhingTargetAction.name=Phing\u30bf\u30fc\u30b2\u30c3\u30c8
 TasksMenuSupportImpl.phing.configure=Phing\u306e\u69cb\u6210...
 TasksMenuSupportImpl.targets.label=\u30bf\u30fc\u30b2\u30c3\u30c8(&T)
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/customizer/Bundle_ja.properties
index f1807f8..cd290f9 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/customizer/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CustomizerSupportImpl.header=IDE\u30a2\u30af\u30b7\u30e7\u30f3\u3092Phing\u30bf\u30fc\u30b2\u30c3\u30c8\u306b\u5272\u308a\u5f53\u3066\u307e\u3059\u3002
 PhingCustomizerProvider.name=Phing
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/options/Bundle_ja.properties
index 639e211..7644eda 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2014 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PhingOptionsPanel.learnMoreLabel.text=<html><a href="#">\u8a73\u7d30</a>
 PhingOptionsPanel.noteLabel.text=<html><i>\u6ce8:</i></html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/resources/BuildXmlDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/resources/BuildXmlDescription_ja.html
index cf1a6d0..de110d8 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/resources/BuildXmlDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/resources/BuildXmlDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/wizard/Bundle_ja.properties
index f8053a0..27d4480 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/ui/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates.build.xml=Phing\u30d3\u30eb\u30c9\u30fb\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/util/Bundle_ja.properties
index 6c5bebe..d53331a 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phing/php-phing/org/netbeans/modules/php/phing/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
 # when run phing target action is called
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpdoc-documentation/php-phpdoc-documentation/org/netbeans/modules/php/phpdoc/documentation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpdoc-documentation/php-phpdoc-documentation/org/netbeans/modules/php/phpdoc/documentation/Bundle_ja.properties
index 220d4fc..6bc60d9 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpdoc-documentation/php-phpdoc-documentation/org/netbeans/modules/php/phpdoc/documentation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpdoc-documentation/php-phpdoc-documentation/org/netbeans/modules/php/phpdoc/documentation/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=PHP\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u751f\u6210\u6a5f\u80fd\u30bf\u30b0\u30fb\u30d8\u30eb\u30d7
 OpenIDE-Module-Display-Category=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/Bundle_ja.properties
index 735ebdb..2f422b2 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Name=phpDocumentor
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/resources/Bundle_ja.properties
index c14ad24..68f6276 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PhpDocumentor 2\u306e\u30b5\u30dd\u30fc\u30c8\u304c\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/Bundle_ja.properties
index d1ecfcc..0d5bf85 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SelectDir=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e
 LBL_SelectDocFolder={0}\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u7528\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/customizer/Bundle_ja.properties
index 46db30c..d9f5f3b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SelectDocFolder=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u7528\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e
 MSG_InvalidTitle=\u30bf\u30a4\u30c8\u30eb\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/options/Bundle_ja.properties
index 91fcf92..421e762 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpdoc/php-phpdoc/org/netbeans/modules/php/phpdoc/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ide options
 LBL_PHPDocOptionsName=phpDocumentor
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/Bundle_ja.properties
index 77ba920..c417bc9 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 PhpUnitTestingProvider.name=PHPUnit
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/commands/Bundle_ja.properties
index a683379..fa595f3 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - file name
 PhpUnit.generating.failure={0}\u30d5\u30a1\u30a4\u30eb\u306f\u751f\u6210\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u8a73\u7d30\u306f\u3001IDE\u306e\u30ed\u30b0\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 # {0} - file name
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/create/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/create/Bundle_ja.properties
index a9b1cd6..fe18f1f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/create/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/create/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 PhpUnitTestCreatorProvider.name=PhpUnit
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/preferences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/preferences/Bundle_ja.properties
index 40ed6aa..b42c8be 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/preferences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/preferences/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 PhpUnitPreferencesValidator.bootstrap.label=\u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7
 PhpUnitPreferencesValidator.configuration.label=XML\u69cb\u6210
 PhpUnitPreferencesValidator.customSuite.label=\u30ab\u30b9\u30bf\u30e0\u30fb\u30b9\u30a4\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/resources/Bundle_ja.properties
index e7acc30..ba111fe 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # module
 OpenIDE-Module-Display-Category=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/run/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/run/Bundle_ja.properties
index 7604e0a..819fcfe 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/run/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/run/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JsonParser.suite.none=&lt;no suite>
 TestCaseVo.tests.no=\u6709\u52b9\u306a\u30c6\u30b9\u30c8\u30fb\u30b1\u30fc\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 TestSessionVo.err.output=\u5168\u51fa\u529b\u306b\u3064\u3044\u3066\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/Bundle_ja.properties
index 7f89852..8df153b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2011 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PhpUnitTestGroupsPanel.dialog.title=\u30c6\u30b9\u30c8\u30fb\u30b0\u30eb\u30fc\u30d7
 PhpUnitTestGroupsPanel.groups.select.all=\u3059\u3079\u3066\u306e\u30c6\u30b9\u30c8\u30fb\u30b0\u30eb\u30fc\u30d7\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/customizer/Bundle_ja.properties
index b225916..e462c4b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CustomizerPhpUnit.bootstrapCheckBox.text=\u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7\u306e\u4f7f\u7528(&U)
 CustomizerPhpUnit.bootstrapLabel.text=\u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7(&B):
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/options/Bundle_ja.properties
index a6a9715..69ca9a5 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PhpUnitOptionsPanel.keywords.coverage=\u30ab\u30d0\u30ec\u30fc\u30b8
 PhpUnitOptionsPanel.keywords.TabTitle=\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u304a\u3088\u3073\u30c4\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitBootstrapDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitBootstrapDescription_ja.html
index 85603fe..a1d5220 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitBootstrapDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitBootstrapDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitConfigurationDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitConfigurationDescription_ja.html
index f3176fe..2fcfc8e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitConfigurationDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitConfigurationDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitSuiteDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitSuiteDescription_ja.html
index 0a72142..11a0af7 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitSuiteDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/ui/resources/emptyPHPUnitSuiteDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/util/Bundle_ja.properties
index 9790afe..be7a3e8 100755
--- a/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-phpunit/php-phpunit/org/netbeans/modules/php/phpunit/util/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 PhpUnitUtils.phpunit.label=PHPUnit\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/Bundle_ja.properties
index b1edb4a..18d8b0c 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ClientSideDevelopmentSupport.reload.copySupportRunning=\u30b5\u30dd\u30fc\u30c8\u306e\u30b3\u30d4\u30fc\u304c\u307e\u3060\u5b9f\u884c\u4e2d\u3067\u3059\u3002\u30da\u30fc\u30b8\u3092\u30ea\u30ed\u30fc\u30c9\u3057\u307e\u3059\u304b\u3002
 ClientSideDevelopmentSupport.reload.customize=\u30ab\u30b9\u30bf\u30de\u30a4\u30ba...
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/annotations/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/annotations/Bundle_ja.properties
index f59c099..8a367a9 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/annotations/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/annotations/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GlobalUserAnnotationsProvider.name=\u30ab\u30b9\u30bf\u30e0
 ProjectUserAnnotationsProvider.name=\u30ab\u30b9\u30bf\u30e0(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8)
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/classpath/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/classpath/Bundle_ja.properties
index 9a602d4..d00f18e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/classpath/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/classpath/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - file path
 # {1} - project name
 IncludePathSupport.Validator.error.anotherProjectSubFile=\u30d1\u30b9{0}\u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{1}\u306b\u5c5e\u3057\u307e\u3059\u3002\u3053\u308c\u3092\u524a\u9664\u3057\u3001\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/Bundle_ja.properties
index 1658f17..3e6540f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # config manager
 LBL_DefaultConfiguration=<\u30c7\u30d5\u30a9\u30eb\u30c8>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/common/Bundle_ja.properties
index fcecd61..ac2daca 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/common/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_RemoteError=\u30ea\u30e2\u30fc\u30c8\u30fb\u30a8\u30e9\u30fc
 MSG_KeepAliveNotNumeric=\u30ad\u30fc\u30d7\u30fb\u30a2\u30e9\u30a4\u30d6\u9593\u9694\u306f\u6570\u5024\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ftp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ftp/Bundle_ja.properties
index 94c530f..16dbe80 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ftp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ftp/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FtpConfigurationValidator.error.proxyAndNotPassive=HTTP\u30d7\u30ed\u30ad\u30b7\u3067\u306f\u53d7\u52d5\u30e2\u30fc\u30c9\u306e\u307f\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 FtpConfigurationValidator.port.range.invalid=\u6700\u5c0f\u30dd\u30fc\u30c8\u306f\u6700\u5927\u30dd\u30fc\u30c8\u3088\u308a\u5c0f\u3055\u3044\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sftp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sftp/Bundle_ja.properties
index 9514a8d..7b4024f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sftp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sftp/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # provider
 LBL_Sftp=SFTP
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/spi/Bundle_ja.properties
index 0d588f8..26aa60f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/spi/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # configuration
 # 0 - name of configuration
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/Bundle_ja.properties
index 00bfbf1..6674930 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Operation.delete.titleWithMnemonic=\u524a\u9664(&E)
 Operation.delete.toolTip=\u524a\u9664\u306e\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/diff/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/diff/Bundle_ja.properties
index a2569f5..0e90a45 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/diff/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/sync/diff/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2012 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BaseStreamSource.title.local=\u30ed\u30fc\u30ab\u30eb\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3
 BaseStreamSource.title.remote=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/Bundle_ja.properties
index 4022d87..f9271f6 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - connection name
 # {1} - connection type (FTP/SFTP)
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/transfer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/transfer/Bundle_ja.properties
index 67df2bc..56cdf16 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/transfer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/transfer/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # transfer files chooser
 LBL_ZeroFilesSelected=0\u500b\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/transfer/tree/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/transfer/tree/Bundle_ja.properties
index 2a35325..c23f675 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/transfer/tree/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/connections/ui/transfer/tree/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # transfer selector
 LBL_SourceFiles=\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/copysupport/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/copysupport/Bundle_ja.properties
index 052f575..42e5ca5 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/copysupport/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/copysupport/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - project name
 CopySupport.warn.invalidSources=<html>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8"{0}"\u306e\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u305b\u305a\u3001\u30d5\u30a1\u30a4\u30eb\u5909\u66f4\u306f\u30b5\u30fc\u30d0\u30fc\u306b\u53cd\u6620\u3055\u308c\u307e\u305b\u3093\u3002<br><br>\u300c\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u554f\u984c\u306e\u89e3\u6c7a...\u300d\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3057\u3066\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4fee\u6b63\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/environment/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/environment/Bundle_ja.properties
index e6b2fae..1aa0554 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/environment/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/environment/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_PleaseWait=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
 TXT_UserDir="~<username>/"\u3068\u3057\u3066\u30de\u30c3\u30d7\u3055\u308c\u308b\u30e6\u30fc\u30b6\u30fc\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30eb\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/internalserver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/internalserver/Bundle_ja.properties
index cb86570..7f3a229 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/internalserver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/internalserver/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 InternalWebServer.error.cancelProcess=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306b\u5bfe\u3057\u3066\u5b9f\u884c\u4e2d\u306e\u5185\u90e8Web\u30b5\u30fc\u30d0\u30fc\u3092\u53d6\u308a\u6d88\u305b\u307e\u305b\u3093\u3002
 InternalWebServer.error.stop=PHP\u7d44\u8fbc\u307fWeb\u30b5\u30fc\u30d0\u30fc\u306e\u505c\u6b62\u4e2d\u306b\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/problems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/problems/Bundle_ja.properties
index 3ceeeb3..5ca7ed5 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/problems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/problems/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DirectoryProblemResolver.dialog.choose=\u9078\u629e
 ProjectPropertiesProblemProvider.invalidIncludePath.description=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u30fb\u30d1\u30b9\u4e0a\u306e\u4e00\u90e8\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u7121\u52b9\u3067\u3059\u3002
 ProjectPropertiesProblemProvider.invalidIncludePath.title=\u7121\u52b9\u306a\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u30fb\u30d1\u30b9
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/resources/Bundle_ja.properties
index 1bf0175..f18b105 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest
 OpenIDE-Module-Name=PHP\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/runconfigs/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/runconfigs/validation/Bundle_ja.properties
index 985abc4..8e86334 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/runconfigs/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/runconfigs/validation/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BaseRunConfigValidator.error.index.label=\u958b\u59cb\u30d5\u30a1\u30a4\u30eb
 # {0} - source of error
 BaseRunConfigValidator.error.relativeFile.invalid={0}\u306f\u6709\u52b9\u306a\u76f8\u5bfeURL\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/Bundle_ja.properties
index 9c23f2d..3855206 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BrowseTestSources.includePath.info=\u30c6\u30b9\u30c8\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0\u30fb\u30af\u30e9\u30b9(PHPUnit\u306a\u3069)\u3092\u30b0\u30ed\u30fc\u30d0\u30eb\u30fb\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u30fb\u30d1\u30b9\u306b\u8ffd\u52a0\u3057\u307e\u3059(\u300c\u30c4\u30fc\u30eb\u300d>\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d>\u300cPHP\u300d)\u3002
 # local server
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/Bundle_ja.properties
index f7976cb..5e10f3b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BuildToolsCommand.buildTool.none=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u4f7f\u7528\u3055\u308c\u3066\u3044\u308b\u30d3\u30eb\u30c9\u30fb\u30c4\u30fc\u30eb(Phing\u306a\u3069)\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 DebugTestMethodCommand.name=\u30c6\u30b9\u30c8\u30fb\u30e1\u30bd\u30c3\u30c9\u306e\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/support/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/support/Bundle_ja.properties
index fbc2aac..7b0c640 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/support/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/support/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ConfigActionSelenium.phpunit.missing=PHPUnit\u30b5\u30dd\u30fc\u30c8\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u307e\u305b\u3093(\u300c\u30c4\u30fc\u30eb\u300d>\u300c\u30d7\u30e9\u30b0\u30a4\u30f3\u300d\u3092\u4f7f\u7528)\u3002
 # {0} - project or file name
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/tests/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/tests/Bundle_ja.properties
index a8f7554..41a3a70 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/tests/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/actions/tests/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_TestNotFound=\u30d5\u30a1\u30a4\u30eb{0}\u306e\u30c6\u30b9\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 MSG_SrcNotFound=\u30d5\u30a1\u30a4\u30eb{0}\u306e\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle_ja.properties
index 2440731..2672cf3 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/customizer/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CompositePanelProviderImpl.category.annotations.title=\u6ce8\u91c8
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/logicalview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/logicalview/Bundle_ja.properties
index 2867efc..aa77e3f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/logicalview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/logicalview/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ConfigFilesNode.name=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb
 # PhpLogicalViewProvider
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/options/Bundle_ja.properties
index 4123436..b61de86 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PHPOptionsCategory_name=PHP
 PHPOptionsCategory_title=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPClassDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPClassDescription_ja.html
index 35a31ef..df7ac2f 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPClassDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPClassDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPFileDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPFileDescription_ja.html
index 0b46bbe..9eed14c 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPInterfaceDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPInterfaceDescription_ja.html
index 1dc1fc6..7211668 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPInterfaceDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPInterfaceDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPTraitDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPTraitDescription_ja.html
index f7c409f..43833b3 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPTraitDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPTraitDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPWebPageDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPWebPageDescription_ja.html
index 32b2ada..0443d96 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPWebPageDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPHPWebPageDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPhpProject_ja.html b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPhpProject_ja.html
index a5d620b..d6c7175 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPhpProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/emptyPhpProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/existingPhpProject_ja.html b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/existingPhpProject_ja.html
index 673eaed..f6ce8c7 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/existingPhpProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/existingPhpProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/phpDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/phpDescription_ja.html
index 108e899..f2d81b3 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/phpDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/phpDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/remotePhpProject_ja.html b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/remotePhpProject_ja.html
index bf2a900..b5868d7 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/remotePhpProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/resources/remotePhpProject_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/testrunner/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/testrunner/Bundle_ja.properties
index cdd4981..619348d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/testrunner/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/testrunner/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_GoToSource=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5(&G)
 # {0} - provider name
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/wizards/Bundle_ja.properties
index 992f1c3..cdcd49d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/ui/wizards/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ConfigureProjectPanel.error.sources.homeDir=\u30bd\u30fc\u30b9\u3092\u3001\u30db\u30fc\u30e0\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u306f\u3067\u304d\u307e\u305b\u3093\u3002
 NewFileNamespacePanel.error.namespace=\u540d\u524d\u7a7a\u9593\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/util/Bundle_ja.properties
index 5cbf43f..3e0ee98 100755
--- a/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-project/php-project/org/netbeans/modules/php/project/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
 # when a php project is created
diff --git a/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/Bundle_ja.properties
index d3d1aed..48e5dba 100755
--- a/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ERR_CannotRefactorLoc=\u3053\u3053\u3067\u306f\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u3067\u304d\u307e\u305b\u3093
 ERR_ElementNotInUsersFile=\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u3067\u304d\u307e\u305b\u3093 - \u8981\u7d20\u304c\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u30fb\u30d1\u30b9\u307e\u305f\u306f\u7f72\u540d\u30d5\u30a1\u30a4\u30eb\u306b\u3042\u308a\u307e\u3059
 ERR_ParsingInProgress=\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u3067\u304d\u307e\u305b\u3093 - \u89e3\u6790\u4e2d\u3067\u3059\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Name=PHP\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/delete/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/delete/Bundle_ja.properties
index 980e08a..d6af4b9 100755
--- a/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/delete/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/delete/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_SafeDel=\u5b89\u5168\u306a\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/findusages/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/findusages/Bundle_ja.properties
index 92bcbf9..e1f30cc 100755
--- a/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/findusages/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/findusages/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_CannotRenameLoc=\u3053\u3053\u3067\u540d\u524d\u306f\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
 ERR_CannotFindUsages=\u3053\u3053\u3067\u4f7f\u7528\u72b6\u6cc1\u3092\u691c\u7d22\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/rename/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/rename/Bundle_ja.properties
index 0f495d8..8d07184 100755
--- a/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/rename/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-refactoring/php-refactoring/org/netbeans/modules/refactoring/php/rename/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Rename=\u540d\u524d\u5909\u66f4
 LBL_Rename_Descr=Php\u8981\u7d20\u306e\u540d\u524d\u306e\u5909\u66f4
diff --git a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/Bundle_ja.properties
index 45267e6..e516b1e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #
diff --git a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-Codeception_ja.html b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-Codeception_ja.html
index 3a15c03..2b2ac84 100755
--- a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-Codeception_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-Codeception_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2015 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-Nette-Tester_ja.html b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-Nette-Tester_ja.html
index 6f205c0..a8b886a 100755
--- a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-Nette-Tester_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-Nette-Tester_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-PHPUnit_ja.html b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-PHPUnit_ja.html
index 6cfc75f..8d346de 100755
--- a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-PHPUnit_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-PHPUnit_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-atoum_ja.html b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-atoum_ja.html
index 178c8f0..867625b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-atoum_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Calculator-atoum_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Rent-a-Flat-Symfony_ja.html b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Rent-a-Flat-Symfony_ja.html
index 1156ce8..d76d472 100755
--- a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Rent-a-Flat-Symfony_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Rent-a-Flat-Symfony_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Rent-a-Flat-Zend_ja.html b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Rent-a-Flat-Zend_ja.html
index 891d38d..0928cb6 100755
--- a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Rent-a-Flat-Zend_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/Rent-a-Flat-Zend_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/TodoList_ja.html b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/TodoList_ja.html
index 0a5c3e5..641b6bf 100755
--- a/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/TodoList_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-samples/php-samples/org/netbeans/modules/php/samples/descriptions/TodoList_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2011 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/Bundle_ja.properties
index a9398e7..d9d13bf 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # framework provider
 LBL_FrameworkName=Smarty PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/Bundle_ja.properties
index 687ee76..134c7ab 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SourceTabCaption=\u30bd\u30fc\u30b9(&S)
 # {0} document name
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/actions/Bundle_ja.properties
index dae0654..6805c8b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ToggleCommentAction_shortDescription=\u30b3\u30e1\u30f3\u30c8\u5207\u66ff\u3048
 toggle-comment=\u30b3\u30e1\u30f3\u30c8\u5207\u66ff\u3048
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/completion/Bundle_ja.properties
index ff2e61b..5c42cba 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/completion/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_No_Doc_For_Target=<b>\u30ea\u30f3\u30af\u30fb\u30bf\u30fc\u30b2\u30c3\u30c8\u306b\u4f7f\u7528\u53ef\u80fd\u306a\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u3042\u308a\u307e\u305b\u3093</b>
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/parser/Bundle_ja.properties
index 6484221..7303168 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/editor/parser/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Parser errors
 ERR_Unopened_Tag=\u958b\u304b\u308c\u3066\u3044\u306a\u3044"{0}"\u30bf\u30b0
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/Bundle_ja.properties
index ba73bc0..48727ca 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/Bundle_ja.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # module description
 OpenIDE-Module-Name=Smarty\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 OpenIDE-Module-Display-Category=PHP
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/TplDescription_ja.html b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/TplDescription_ja.html
index 4d89b38..1090e21 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/TplDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/resources/TplDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/Bundle_ja.properties
index 2a1f619..803fd40 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 SaveConfirmationPanel.doNotShowAgainCheckBox.text=\u4eca\u5f8c\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u8b66\u544a\u3092\u8868\u793a\u3057\u306a\u3044
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/customizer/Bundle_ja.properties
index 6155e88..9acce48 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/customizer/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 SmartyCustomizerPanel.customOpenDelimiterLabel.text=\u958b\u59cb\u533a\u5207\u308a\u6587\u5b57
 SmartyCustomizerPanel.customCloseDelimiterLabel.text=\u7d42\u4e86\u533a\u5207\u308a\u6587\u5b57
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/notification/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/notification/Bundle_ja.properties
index 28efec3..c03aee6 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/notification/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/notification/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 AutodetectionPanel.ignoreLabel.text=\u8868\u793a\u3057\u306a\u3044
 AutodetectionPanel.lbl.ignore=\u4eca\u5f8c\u3053\u308c\u3092\u8868\u793a\u3057\u306a\u3044
 AutodetectionPanel.msg.autodetect=Smarty\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u304c\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u3067\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u30b5\u30dd\u30fc\u30c8\u304c\u6709\u52b9\u306b\u306a\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/options/Bundle_ja.properties
index 48dc4d1..551a480 100755
--- a/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-smarty/php-smarty/org/netbeans/modules/php/smarty/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ide options
 LBL_PHPSmartyOptionsName=Smarty
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/Bundle_ja.properties
index 45fb0cd..576ed13 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # framework provider
 LBL_FrameworkName=Symfony PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/commands/Bundle_ja.properties
index 6cbd121..c43d7f7 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/commands/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # symfony command support
 MSG_Symfony=Symfony
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/resources/Bundle_ja.properties
index afd2357..1c03c14 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=Symfony\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u30fb\u30d0\u30fc\u30b8\u30e7\u30f31\u306e\u30ec\u30ac\u30b7\u30fc\u30fb\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/actions/Bundle_ja.properties
index 77c9ae6..f75c8aa 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SymfonyAction=Symfony: {0}
 LBL_ClearCache=\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u30af\u30ea\u30a2
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/customizer/Bundle_ja.properties
index cbf94ac..a043c46 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SymfonyCustomizerPanel.ignoreCacheDirectoryCheckBox.text=<html><i>cache</i>\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u7121\u8996(&I)
 SymfonyCustomizerPanel.infoLabel.text=\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u306f\u3067\u8a2d\u5b9a\u3067\u304d\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/options/Bundle_ja.properties
index c9369f6..d7a58f7 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ide options
 LBL_PHPSymfonyOptionsName=Symfony
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/wizards/Bundle_ja.properties
index fd461a2..e4537aa 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony/php-symfony/org/netbeans/modules/php/symfony/ui/wizards/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_NoAppName=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u540d\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 MSG_InvalidAppName=\u7121\u52b9\u306a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u540d"{0}"(\u7a7a\u767d\u4ee5\u5916\u306e\u6587\u5b57\u3060\u3051\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059)\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/Bundle_ja.properties
index 51544f5..671658c 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_FrameworkDescription=Symfony 2/3 PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 LBL_FrameworkName=Symfony 2/3 PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 LBL_Symfony2=Symfony 2/3
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/extra/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/extra/Bundle_ja.properties
index 343526a..f9159e1 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/extra/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/extra/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 \n# import routes from a controller class\npost:\n    resource: "@SensioBlogBundle/Controller/PostController.php"\n    type:     annotation\n</code></pre>\n<p>\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5168\u4f53\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002</p><p style="font-weight: bold; font-size: 1.1em">\u4f8b</p><pre><code>\n# import routes from a controller directory\nblog:\n    resource: "@SensioBlogBundle/Controller"\n    type:     annotation\n</code></pre>\n<p>\u4ed6\u306e\u30ea\u30bd\u30fc\u30b9\u306b\u3064\u3044\u3066\u306f\u3001\u7279\u5b9a\u306e\u63a5\u982d\u8f9e\u4e0b\u3092\u30de\u30a6\u30f3\u30c8\u3067\u304d\u307e\u3059\u3002</p><p style="font-weight: bold; font-size: 1.1em">\u4f8b</p><pre><code>\npost:\n    resource: "@SensioBlogBundle/Controller/PostController.php"\n    prefix:   /blog\n    type:     annotation\n</code></pre>\n<p style="font-weight: bold; font-size: 1.1em">\u30eb\u30fc\u30c8\u540d</p><p><code>@Route</code>\u6ce8\u91c8\u3067\u5b9a\u7fa9\u3055\u308c\u305f\u30eb\u30fc\u30c8\u306b\u306f\u3001\u30d0\u30f3\u30c9\u30eb\u540d\u3001\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u540d\u304a\u3088\u3073\u30a2\u30af\u30b7\u30e7\u30f3\u540d\u3067\u69cb\u6210\u3055\u308c\u305f\u30c7\u30d5\u30a9\u30eb\u30c8\u540d\u304c\u4ed8\u3051\u3089\u308c\u307e\u3059\u3002\u524d\u8ff0\u306e\u4f8b\u306e\u5834\u5408\u3001<code>sensio_blog_post_index</code>\u3067\u3059\u3002</p><p><code>name</code>\u5c5e\u6027\u3092\u4f7f\u7528\u3057\u3066\u3001\u3053\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30eb\u30fc\u30c8\u540d\u3092\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3067\u304d\u307e\u3059\u3002</p><p style="font-weight: bold; font-size: 1.1em">\u4f8b</p><pre><code>\n/**\n * @Route("/", name="blog_home")\n */\npublic function indexAction() {\n    // ...\n}\n</code></pre>\n<p style="font-weight: bold; font-size: 1.1em">\u30eb\u30fc\u30c8\u63a5\u982d\u8f9e</p><p>\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fb\u30af\u30e9\u30b9\u306b\u304a\u3051\u308b<code>@Route</code>\u6ce8\u91c8\u3067\u306f\u3059\u3079\u3066\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u30fb\u30eb\u30fc\u30c8\u306e\u63a5\u982d\u8f9e\u304c\u5b9a\u7fa9\u3055\u308c\u307e\u3059\u3002</p><p style="font-weight: bold; font-size: 1.1em">\u4f8b</p><pre><code>\n/**\n * @Route("/blog")\n */\nclass PostController extends Controller {\n    /**\n     * @Route("/{id}")\n     */\n    public function showAction($id) {\n    }\n}\n</code></pre>\n<p>\u3053\u308c\u3067\u3001<code>show</code>\u30a2\u30af\u30b7\u30e7\u30f3\u306f<code>/blog/{id}</code>\u30d1\u30bf\u30fc\u30f3\u306b\u30de\u30c3\u30d7\u3055\u308c\u307e\u3059\u3002</p>
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/security/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/security/Bundle_ja.properties
index a569d74..4da9873 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/security/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/security/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/validators/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/validators/Bundle_ja.properties
index 60ae4c1..0020903 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/validators/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/annotations/validators/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Symfony2ValidatorsAnnotationsProvider.name=Symfony2\u30d0\u30ea\u30c7\u30fc\u30bf
 
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/commands/Bundle_ja.properties
index ac10048..98524ee 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/commands/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 InstallerExecutable.run.title=Symfony 2/3 ({0})
 LBL_Usage=\u4f7f\u7528\u65b9\u6cd5:
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/options/Bundle_ja.properties
index 7bb4d3b..700b8b8 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/options/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 SymfonyOptionsValidator.installer=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9
 SymfonyOptionsValidator.sandbox=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9
 SymfonyOptionsValidator.sandbox.notZip=\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u306fZIP\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/resources/Bundle_ja.properties
index a4f6583..6959064 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=Symfony 2/3\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/actions/Bundle_ja.properties
index 181834a..ce3b354 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CacheClearAction.name=\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u30af\u30ea\u30a2
 CacheWarmupAction.name=\u30a6\u30a9\u30fc\u30e0\u30a2\u30c3\u30d7\u30fb\u30ad\u30e3\u30c3\u30b7\u30e5
 # {0} - command name
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/customizer/Bundle_ja.properties
index 3d3d9ea..47ece6d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SymfonyCustomizerPanel.browseAppDir.title="app"\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u9078\u629e
 SymfonyCustomizerPanel.ignoreCacheDirectoryCheckBox.text=<html><i>cache</i>\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u7121\u8996(&G)
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/options/Bundle_ja.properties
index 3fc6dd4..b73ec1a 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_SelectSandbox=Symfony Standard Edition (.zip)\u306e\u9078\u629e
 LBL_ZipFilesFilter=Zip\u30d5\u30a1\u30a4\u30eb(*.zip)
diff --git a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/wizards/Bundle_ja.properties
index 93188f9..9a883b0 100755
--- a/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-symfony2/php-symfony2/org/netbeans/modules/php/symfony2/ui/wizards/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NewProjectConfigurationPanel.info.installer=<html>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f<i>Symfony\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9</i>\u3092\u4f7f\u7528\u3057\u3066\u4f5c\u6210\u3055\u308c\u307e\u3059\u3002</html>
 NewProjectConfigurationPanel.info.sandbox=<html>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f<i>Symfony\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9</i>\u3092\u4f7f\u7528\u3057\u3066\u4f5c\u6210\u3055\u308c\u307e\u3059\u3002</html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/Bundle_ja.properties
index 43435a8..8fe029d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Source=\u30bd\u30fc\u30b9(&S)
 TwigResolver=Twig\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/completion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/completion/Bundle_ja.properties
index 0382c95..e844d3a 100755
--- a/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/completion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/completion/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FilterRhs=\u30d5\u30a3\u30eb\u30bf
 FunctionRhs=\u95a2\u6570
diff --git a/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/ui/options/Bundle_ja.properties
index a8b5864..082221d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/editor/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_TwigOptionsName=Twig
 TwigPanel.jLabel1.text=\u30b3\u30e1\u30f3\u30c8\u5207\u66ff\u3048:
diff --git a/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/resources/Bundle_ja.properties
index 8cadc49..59894d2 100755
--- a/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-twig/php-twig/org/netbeans/modules/php/twig/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
-#
-# Contributor(s): Sebastian H\u00f6rl
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=PHP\u306eTwig\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30fb\u30a8\u30f3\u30b8\u30f3\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/Bundle_ja.properties
index 588132a..f7aa016 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # framework provider
 LBL_FrameworkName=Zend PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/commands/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/commands/Bundle_ja.properties
index 2ad5376..acdd54a 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/commands/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/commands/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # zend command support
 MSG_Zend=Zend
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/resources/Bundle_ja.properties
index 49b5822..d47bfd2 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=Zend\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u30fb\u30d0\u30fc\u30b8\u30e7\u30f31\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/actions/Bundle_ja.properties
index f45dbeb..87d9bfb 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ZendAction=Zend: {0}
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/options/Bundle_ja.properties
index 8d4e7a3..f9cff7b 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ide options
 LBL_PHPZendOptionsName=Zend
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/wizards/Bundle_ja.properties
index 3f69b0b..932389d 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend/php-zend/org/netbeans/modules/php/zend/ui/wizards/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NewProjectConfigurationPanel.optionsLabel.toolTipText=IDE\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u958b\u304d\u307e\u3059\u3002
 NewProjectConfigurationPanel.optionsLabel.text=<html><font color="#0000FF"><u>\u30aa\u30d7\u30b7\u30e7\u30f3...</u></font></html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/Bundle_ja.properties
index 40e84df..04258f4 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Zend2PhpFrameworkProvider.framework.description=Zend2 PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 Zend2PhpFrameworkProvider.framework.name=Zend2 PHP Web\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
 
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/resources/Bundle_ja.properties
index 5d03da8..537f700 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=PHP
 OpenIDE-Module-Long-Description=Zend\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af2\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/ui/options/Bundle_ja.properties
index 32ca2c5..06da6c8 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 PhpOptions.zend2.keywords.TabTitle=\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u304a\u3088\u3073\u30c4\u30fc\u30eb
 Zend2OptionsPanel.browse.skeleton=Zend\u30b9\u30b1\u30eb\u30c8\u30f3\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3(.zip)\u3092\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/ui/wizards/Bundle_ja.properties
index fd4bf11..6fc6606 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/ui/wizards/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NewProjectConfigurationPanel.infoLabel.text=<html>\u9078\u629e\u3057\u305f<i>Zend\u30b9\u30b1\u30eb\u30c8\u30f3\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3</i>\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002</html>
 NewProjectConfigurationPanel.optionsLabel.text=<html><a href="#">\u30aa\u30d7\u30b7\u30e7\u30f3...</a></html>
diff --git a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/validation/Bundle_ja.properties
index bfbbc01..1f3a44e 100755
--- a/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/php-zend2/php-zend2/org/netbeans/modules/php/zend2/validation/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OptionsValidator.skeleton.notZip=\u30b9\u30b1\u30eb\u30c8\u30f3\u304cZIP\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 OptionsValidator.skeleton.title=\u30b9\u30b1\u30eb\u30c8\u30f3
 
diff --git a/netbeans-l10n-zip/src/ja/php/selenium2-php/selenium2-php/org/netbeans/modules/selenium2/php/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/selenium2-php/selenium2-php/org/netbeans/modules/selenium2/php/Bundle_ja.properties
index 839dd15..645f040 100755
--- a/netbeans-l10n-zip/src/ja/php/selenium2-php/selenium2-php/org/netbeans/modules/selenium2/php/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/selenium2-php/selenium2-php/org/netbeans/modules/selenium2/php/Bundle_ja.properties
@@ -1,42 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project
 NO_SELENIUM_SUPPORT=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306b\u5bfe\u3059\u308bSelenium 2.0\u30b5\u30dd\u30fc\u30c8\u306f\u3042\u308a\u307e\u305b\u3093
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Selenium 2 Php\u30b5\u30dd\u30fc\u30c8
 Selenium2_Template_Wizard_Title=Selenium 2.0\u30c6\u30b9\u30c8\u30fb\u30b1\u30fc\u30b9\u540d
 SeleniumTestCase_displayName=Selenium\u30c6\u30b9\u30c8\u30fb\u30b1\u30fc\u30b9
diff --git a/netbeans-l10n-zip/src/ja/php/selenium2-php/selenium2-php/org/netbeans/modules/selenium2/php/SeleneseTestPHP_ja.html b/netbeans-l10n-zip/src/ja/php/selenium2-php/selenium2-php/org/netbeans/modules/selenium2/php/SeleneseTestPHP_ja.html
index 9b2ab36..13213e4 100755
--- a/netbeans-l10n-zip/src/ja/php/selenium2-php/selenium2-php/org/netbeans/modules/selenium2/php/SeleneseTestPHP_ja.html
+++ b/netbeans-l10n-zip/src/ja/php/selenium2-php/selenium2-php/org/netbeans/modules/selenium2/php/SeleneseTestPHP_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/php/spellchecker-bindings-php/spellchecker-bindings-php/org/netbeans/modules/spellchecker/bindings/php/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/spellchecker-bindings-php/spellchecker-bindings-php/org/netbeans/modules/spellchecker/bindings/php/resources/Bundle_ja.properties
index 260d091..7d86e6b 100755
--- a/netbeans-l10n-zip/src/ja/php/spellchecker-bindings-php/spellchecker-bindings-php/org/netbeans/modules/spellchecker/bindings/php/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/spellchecker-bindings-php/spellchecker-bindings-php/org/netbeans/modules/spellchecker/bindings/php/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Long-Description=PHP\u3067\u306e\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30ab\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30b9\u30da\u30eb\u30fb\u30c1\u30a7\u30c3\u30abPHP\u8a00\u8a9e\u30d0\u30a4\u30f3\u30c9
diff --git a/netbeans-l10n-zip/src/ja/php/websvc-saas-codegen-php/websvc-saas-codegen-php/org/netbeans/modules/websvc/saas/codegen/php/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/php/websvc-saas-codegen-php/websvc-saas-codegen-php/org/netbeans/modules/websvc/saas/codegen/php/Bundle_ja.properties
index 137497d..f02a365 100755
--- a/netbeans-l10n-zip/src/ja/php/websvc-saas-codegen-php/websvc-saas-codegen-php/org/netbeans/modules/websvc/saas/codegen/php/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/php/websvc-saas-codegen-php/websvc-saas-codegen-php/org/netbeans/modules/websvc/saas/codegen/php/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Name=PHP\u7528SaaS\u30b5\u30fc\u30d3\u30b9\u30fb\u30b3\u30fc\u30c9\u751f\u6210
diff --git a/netbeans-l10n-zip/src/ja/platform/applemenu/applemenu/org/netbeans/modules/applemenu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/applemenu/applemenu/org/netbeans/modules/applemenu/Bundle_ja.properties
index 8dd4e6d..693aad2 100755
--- a/netbeans-l10n-zip/src/ja/platform/applemenu/applemenu/org/netbeans/modules/applemenu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/applemenu/applemenu/org/netbeans/modules/applemenu/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_MinimizeWindowAction=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u6700\u5c0f\u5316(&M)
 OpenIDE-Module-Name=Apple\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30e1\u30cb\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/platform/autoupdate-cli/autoupdate-cli/org/netbeans/modules/autoupdate/cli/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/autoupdate-cli/autoupdate-cli/org/netbeans/modules/autoupdate/cli/Bundle_ja.properties
index 273e271..b1d2f30 100755
--- a/netbeans-l10n-zip/src/ja/platform/autoupdate-cli/autoupdate-cli/org/netbeans/modules/autoupdate/cli/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/autoupdate-cli/autoupdate-cli/org/netbeans/modules/autoupdate/cli/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - regexp
 MSG_CantCompileRegex=\u6b63\u898f\u8868\u73fe''{0}''\u3092\u8a8d\u8b58\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/services/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/services/Bundle_ja.properties
index 10489d9..419b564 100755
--- a/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/services/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/services/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 broad_category=\u30e9\u30a4\u30d6\u30e9\u30ea\u3001\u30d6\u30ea\u30c3\u30b8\u3001\u672a\u5206\u985e
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 InstallSupportImpl_Download_Estabilish=\u63a5\u7d9a\u3092\u78ba\u7acb\u3057\u3066\u3044\u307e\u3059...
 UpdateUnitProviderImpl_FormatCheckingForUpdates={0}\u3067\u66f4\u65b0\u3092\u78ba\u8a8d\u3057\u3066\u3044\u307e\u3059...
 InstallSupportImpl_Validate_CorruptedNBM=NBM {0}\u3092\u8aad\u307f\u53d6\u308c\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/services/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/services/resources/Bundle_ja.properties
index 2ca2616..4df8c26 100755
--- a/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/services/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/services/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u81ea\u52d5\u66f4\u65b0\u6a5f\u80fd\u306f\u3001\u6b21\u306e\u69d8\u3005\u306a\u30b5\u30fc\u30d3\u30b9\u3092\u63d0\u4f9b\u3057\u307e\u3059: \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u305f\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5229\u7528\u53ef\u80fd\u306a\u66f4\u65b0\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3068\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3001\u30b5\u30d6\u30b9\u30af\u30e9\u30a4\u30d6\u3057\u305f\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30fb\u30bb\u30f3\u30bf\u30fc\u304b\u3089\u306e\u65b0\u3057\u3044\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u691c\u7d22\u3068\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3001\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u8868\u793a\u3068\u7ba1\u7406\u306a\u3069\u3067\u3059\u3002
 OpenIDE-Module-Name=\u81ea\u52d5\u66f4\u65b0\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/updateprovider/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/updateprovider/Bundle_ja.properties
index 0af3ba1..9ee1ad0 100755
--- a/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/updateprovider/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/autoupdate-services/autoupdate-services/org/netbeans/modules/autoupdate/updateprovider/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_CatalogUpdatesProviderFactory_DefaultName=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30fb\u30bb\u30f3\u30bf\u30fc
 
 
diff --git a/netbeans-l10n-zip/src/ja/platform/autoupdate-services/ext/updater/org/netbeans/updater/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/autoupdate-services/ext/updater/org/netbeans/updater/Bundle_ja.properties
index 4951d44..1d7bd44 100755
--- a/netbeans-l10n-zip/src/ja/platform/autoupdate-services/ext/updater/org/netbeans/updater/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/autoupdate-services/ext/updater/org/netbeans/updater/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_PreparingUnpack=\u5c55\u958b\u3092\u6e96\u5099\u4e2d
 CTL_UnpackingFile=\u5c55\u958b\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_ja.properties
index bb27ed7..1009734 100755
--- a/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 active_handle=\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u30a2\u30af\u30c6\u30a3\u30d6\u5316
 active_handle_single={0}\u3092\u30a2\u30af\u30c6\u30a3\u30d6\u5316\u3057\u3066\u3044\u307e\u3059
 cbLocation_InstallDefault=\u30c7\u30d5\u30a9\u30eb\u30c8
@@ -13,43 +30,6 @@
 modified_taMessage_ErrorText=\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u30fb\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3092\u5b8c\u4e86\u3067\u304d\u307e\u305b\u3093\u3002\u539f\u56e0: {0}
 # {0} - plugin name
 modified_taTitle_Text=\u30e2\u30b8\u30e5\u30fc\u30eb{0}\u306f\u5909\u66f4\u3055\u308c\u3066\u304a\u308a\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3067\u304d\u307e\u305b\u3093\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 More_Command_Text={0}\u5897\u3084\u3059...
 Less_Command_Text={0}\u6e1b\u3089\u3059...
 networkproblem_header=NetBeans\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30dd\u30fc\u30bf\u30eb\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/actions/Bundle_ja.properties
index 84813fc..809547b 100755
--- a/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/actions/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 CTL_CheckForUpdatesAction=\u66f4\u65b0\u306e\u78ba\u8a8d(&U)
 PluginManagerAction_Name=\u30d7\u30e9\u30b0\u30a4\u30f3(&G)
 PluginManager_Panel_Name=\u30d7\u30e9\u30b0\u30a4\u30f3
diff --git a/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/resources/Bundle_ja.properties
index 7db8b0b..1619981 100755
--- a/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=UI\u306b\u3088\u3063\u3066\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3068\u767b\u9332\u6e08\u306e\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30fb\u30bb\u30f3\u30bf\u30fc\u306e\u5185\u5bb9\u3092\u53c2\u7167\u3067\u304d\u3001\u66f4\u65b0\u30e2\u30b8\u30e5\u30fc\u30eb\u307e\u305f\u306f\u65b0\u898f\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u305f\u308a\u3001\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u81ea\u52d5\u7684\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u305f\u308a\u3067\u304d\u307e\u3059\u3002
 OpenIDE-Module-Name=\u81ea\u52d5\u66f4\u65b0UI
diff --git a/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle_ja.properties
index 375877a..e975410 100755
--- a/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/wizards/Bundle_ja.properties
@@ -1,46 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 cancel=\u53d6\u6d88
 # {0} - plugin_name
 inBackground_WritePermission=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u30d7\u30e9\u30b0\u30a4\u30f3{0}\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 inBackground_WritePermission_Details=\u8a73\u7d30
 install=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059\u304b
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
-OperationDescriptionStep_Header_Head=\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d
+perationDescriptionStep_Header_Head=\u30d7\u30e9\u30b0\u30a4\u30f3\u30fb\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3078\u3088\u3046\u3053\u305d
 OperationDescriptionStep_Header_Content=\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u306f\u3001\u9078\u629e\u3057\u305f\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3001\u78ba\u8a8d\u3057\u3066\u3001\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059\u3002
 OperationDescriptionStep_TableInstall_Title=\u6b21\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u307e\u3059:
 OperationDescriptionStep_TableUpdate_Title=\u6b21\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u304c\u66f4\u65b0\u3055\u308c\u307e\u3059:
diff --git a/netbeans-l10n-zip/src/ja/platform/core-kit/core-kit/org/netbeans/modules/core/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/core-kit/core-kit/org/netbeans/modules/core/kit/Bundle_ja.properties
index 8124019..8f0b0da 100755
--- a/netbeans-l10n-zip/src/ja/platform/core-kit/core-kit/org/netbeans/modules/core/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/core-kit/core-kit/org/netbeans/modules/core/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=RCP\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
 OpenIDE-Module-Name=RCP\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
 OpenIDE-Module-Short-Description=NetBeans RCP\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/platform/editor-mimelookup-impl/editor-mimelookup-impl/org/netbeans/modules/editor/mimelookup/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/editor-mimelookup-impl/editor-mimelookup-impl/org/netbeans/modules/editor/mimelookup/impl/Bundle_ja.properties
index 8dec4ee..9d4db0a 100755
--- a/netbeans-l10n-zip/src/ja/platform/editor-mimelookup-impl/editor-mimelookup-impl/org/netbeans/modules/editor/mimelookup/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/editor-mimelookup-impl/editor-mimelookup-impl/org/netbeans/modules/editor/mimelookup/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=SystemFS\u306eMIME\u30eb\u30c3\u30af\u30a2\u30c3\u30d7
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/editor-mimelookup/editor-mimelookup/org/netbeans/modules/editor/mimelookup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/editor-mimelookup/editor-mimelookup/org/netbeans/modules/editor/mimelookup/Bundle_ja.properties
index 79fffcb..4612ae2 100755
--- a/netbeans-l10n-zip/src/ja/platform/editor-mimelookup/editor-mimelookup/org/netbeans/modules/editor/mimelookup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/editor-mimelookup/editor-mimelookup/org/netbeans/modules/editor/mimelookup/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=MIME\u30eb\u30c3\u30af\u30a2\u30c3\u30d7API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/favorites/favorites/org/netbeans/modules/favorites/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/favorites/favorites/org/netbeans/modules/favorites/Bundle_ja.properties
index c4dd98c..8541eb4 100755
--- a/netbeans-l10n-zip/src/ja/platform/favorites/favorites/org/netbeans/modules/favorites/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/favorites/favorites/org/netbeans/modules/favorites/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_Add=\u304a\u6c17\u306b\u5165\u308a\u306b\u8ffd\u52a0(&R)
 ACT_AddOnFavoritesNode=\u304a\u6c17\u306b\u5165\u308a\u306b\u8ffd\u52a0(&A)...
diff --git a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/Bundle_ja.properties
index f3e114d..5907619 100755
--- a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Help system
 # {0} - URL
diff --git a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/Bundle_ja.properties
index 3ab6672..ae58bf1 100755
--- a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JavaHelp\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpPage_ja.html b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpPage_ja.html
index 4c9f8df..0bddc58 100755
--- a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpPage_ja.html
+++ b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpPage_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 
 <HTML><head>
diff --git a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpSet_ja.xml b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpSet_ja.xml
index 7cfb5c1..7c3d92a 100755
--- a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpSet_ja.xml
+++ b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/masterHelpSet_ja.xml
@@ -1,47 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 <!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN" "http://java.sun.com/products/javahelp/helpset_2_0.dtd">
 <helpset version="2.0">
diff --git a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notEnabledModule_ja.html b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notEnabledModule_ja.html
index 2ae92fd..b8e35b0 100755
--- a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notEnabledModule_ja.html
+++ b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notEnabledModule_ja.html
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notInstalledModule_ja.html b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notInstalledModule_ja.html
index b9e9b35..a819a00 100755
--- a/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notInstalledModule_ja.html
+++ b/netbeans-l10n-zip/src/ja/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/notInstalledModule_ja.html
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/platform/junitlib/junitlib/org/netbeans/modules/junitlib/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/junitlib/junitlib/org/netbeans/modules/junitlib/Bundle_ja.properties
index 3afcc8e..cc6746d 100755
--- a/netbeans-l10n-zip/src/ja/platform/junitlib/junitlib/org/netbeans/modules/junitlib/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/junitlib/junitlib/org/netbeans/modules/junitlib/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JUnit
 OpenIDE-Module-Display-Category=Java SE
 OpenIDE-Module-Short-Description=JUnit\u30c6\u30b9\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u30d0\u30f3\u30c9\u30eb\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/keyring-fallback/keyring-fallback/org/netbeans/modules/keyring/fallback/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/keyring-fallback/keyring-fallback/org/netbeans/modules/keyring/fallback/Bundle_ja.properties
index 9e5090c..f92bc06 100755
--- a/netbeans-l10n-zip/src/ja/platform/keyring-fallback/keyring-fallback/org/netbeans/modules/keyring/fallback/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/keyring-fallback/keyring-fallback/org/netbeans/modules/keyring/fallback/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Name=\u30ad\u30fc\u30fb\u30ea\u30f3\u30b0\u30fb\u30d5\u30a9\u30fc\u30eb\u30d0\u30c3\u30af
 FallbackProvider.sample_key.description=\u5fa9\u53f7\u5316\u3067\u304d\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3059\u308b\u305f\u3081\u306e\u30b5\u30f3\u30d7\u30eb\u5024\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/keyring-impl/keyring-impl/org/netbeans/modules/keyring/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/keyring-impl/keyring-impl/org/netbeans/modules/keyring/impl/Bundle_ja.properties
index efa1d29..d665a4c 100755
--- a/netbeans-l10n-zip/src/ja/platform/keyring-impl/keyring-impl/org/netbeans/modules/keyring/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/keyring-impl/keyring-impl/org/netbeans/modules/keyring/impl/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30ad\u30fc\u30ea\u30f3\u30b0\u306e\u5b9f\u88c5
 
diff --git a/netbeans-l10n-zip/src/ja/platform/keyring/keyring/org/netbeans/api/keyring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/keyring/keyring/org/netbeans/api/keyring/Bundle_ja.properties
index 852c321..3d03a67 100755
--- a/netbeans-l10n-zip/src/ja/platform/keyring/keyring/org/netbeans/api/keyring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/keyring/keyring/org/netbeans/api/keyring/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_KeyringAccess=\u30ad\u30fc\u30ea\u30f3\u30b0\u30fb\u30a2\u30af\u30bb\u30b9\u3092\u30ea\u30af\u30a8\u30b9\u30c8\u3057\u3066\u3044\u307e\u3059
 
diff --git a/netbeans-l10n-zip/src/ja/platform/keyring/keyring/org/netbeans/modules/keyring/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/keyring/keyring/org/netbeans/modules/keyring/Bundle_ja.properties
index b73f21f..04af494 100755
--- a/netbeans-l10n-zip/src/ja/platform/keyring/keyring/org/netbeans/modules/keyring/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/keyring/keyring/org/netbeans/modules/keyring/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30ad\u30fc\u30ea\u30f3\u30b0API
 Passwords.Options.Export.displayName=\u30d1\u30b9\u30ef\u30fc\u30c9
 Keyring.Options.Export.displayName=\u30ad\u30fc\u30ea\u30f3\u30b0\u304a\u3088\u3073\u30d1\u30b9\u30ef\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/platform/masterfs-linux/masterfs-linux/org/netbeans/modules/masterfs/watcher/linux/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/masterfs-linux/masterfs-linux/org/netbeans/modules/masterfs/watcher/linux/Bundle_ja.properties
index e52ffda..fb8b824 100755
--- a/netbeans-l10n-zip/src/ja/platform/masterfs-linux/masterfs-linux/org/netbeans/modules/masterfs/watcher/linux/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/masterfs-linux/masterfs-linux/org/netbeans/modules/masterfs/watcher/linux/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0@ Linux
 
diff --git a/netbeans-l10n-zip/src/ja/platform/masterfs-macosx/masterfs-macosx/org/netbeans/modules/masterfs/watcher/macosx/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/masterfs-macosx/masterfs-macosx/org/netbeans/modules/masterfs/watcher/macosx/Bundle_ja.properties
index 68402ff..5c273f0 100755
--- a/netbeans-l10n-zip/src/ja/platform/masterfs-macosx/masterfs-macosx/org/netbeans/modules/masterfs/watcher/macosx/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/masterfs-macosx/masterfs-macosx/org/netbeans/modules/masterfs/watcher/macosx/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0@ Mac OS X
 
diff --git a/netbeans-l10n-zip/src/ja/platform/masterfs-nio2/masterfs-nio2/org/netbeans/modules/masterfs/watcher/nio2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/masterfs-nio2/masterfs-nio2/org/netbeans/modules/masterfs/watcher/nio2/Bundle_ja.properties
index 9566f64..f6a19bd 100755
--- a/netbeans-l10n-zip/src/ja/platform/masterfs-nio2/masterfs-nio2/org/netbeans/modules/masterfs/watcher/nio2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/masterfs-nio2/masterfs-nio2/org/netbeans/modules/masterfs/watcher/nio2/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0@ NIO2
 
diff --git a/netbeans-l10n-zip/src/ja/platform/masterfs-ui/masterfs-ui/org/netbeans/modules/masterfs/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/masterfs-ui/masterfs-ui/org/netbeans/modules/masterfs/ui/Bundle_ja.properties
index 14d6eaa..fbbc65f 100755
--- a/netbeans-l10n-zip/src/ja/platform/masterfs-ui/masterfs-ui/org/netbeans/modules/masterfs/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/masterfs-ui/masterfs-ui/org/netbeans/modules/masterfs/ui/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0 - UI\u62e1\u5f35
 
diff --git a/netbeans-l10n-zip/src/ja/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ja.properties
index 44b0e0d..e6f5d56 100755
--- a/netbeans-l10n-zip/src/ja/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0@ Windows
 
diff --git a/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/filebasedfs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/filebasedfs/Bundle_ja.properties
index 62bbbab..d2a233a 100755
--- a/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/filebasedfs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/filebasedfs/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} = name of the file to create
 # {1} = path of the folder to create in
diff --git a/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/filebasedfs/fileobjects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/filebasedfs/fileobjects/Bundle_ja.properties
index 4d82f6a..68f4ec6 100755
--- a/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/filebasedfs/fileobjects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/filebasedfs/fileobjects/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 EXC_FileAlreadyLocked=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u3059\u3067\u306b\u30ed\u30c3\u30af\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 EXC_FileLockAlreadyExists=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u3059\u3067\u306b\u30ed\u30c3\u30af\u3055\u308c\u3066\u3044\u307e\u3059(\u30ed\u30c3\u30af{1}\u304c\u5b58\u5728\u3057\u307e\u3059)\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/resources/Bundle_ja.properties
index a17f153..4acede5 100755
--- a/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/masterfs/masterfs/org/netbeans/modules/masterfs/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest.mf
 OpenIDE-Module-Name=\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0
diff --git a/netbeans-l10n-zip/src/ja/platform/netbinox/netbinox/org/netbeans/modules/netbinox/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/netbinox/netbinox/org/netbeans/modules/netbinox/Bundle_ja.properties
index c638335..977ddc2 100755
--- a/netbeans-l10n-zip/src/ja/platform/netbinox/netbinox/org/netbeans/modules/netbinox/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/netbinox/netbinox/org/netbeans/modules/netbinox/Bundle_ja.properties
@@ -1,41 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Oracle, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=NetBeans Equinox\u7d71\u5408
 
diff --git a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/api/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/api/options/Bundle_ja.properties
index 42542e7..4947e89 100755
--- a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/api/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/api/options/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_Loading_Options_Waiting=\u30aa\u30d7\u30b7\u30e7\u30f3\u8a2d\u5b9a\u306e\u30ed\u30fc\u30c9\u4e2d
 
diff --git a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/Bundle_ja.properties
index 9d67914..c5eac0f 100755
--- a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - name of the category button
 CategoryButton_AccessibleDescription={0}\u30ab\u30c6\u30b4\u30ea\u30fb\u30dc\u30bf\u30f3\u3002\u77e2\u5370\u30ad\u30fc\u3092\u4f7f\u7528\u3057\u3066\u3001\u6700\u4e0a\u4f4d\u30ab\u30c6\u30b4\u30ea\u9593\u3067\u79fb\u52d5\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/advanced/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/advanced/Bundle_ja.properties
index fa572a6..f894bd4 100755
--- a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/advanced/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/advanced/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #Advanced
diff --git a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/classic/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/classic/Bundle_ja.properties
index dbf1220..371b7b5 100755
--- a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/classic/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/classic/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #actions available on cells in Options dialog
 LBL_action_define=\u3053\u3053\u3067\u5b9a\u7fa9
diff --git a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_ja.properties
index 24d0286..d8ef1eb 100755
--- a/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - path where the exported options are saved
 Export_Notification_DetailsText=\u30d5\u30a1\u30a4\u30eb\u306f{0}\u306b\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_ja.properties
index ce31ca2..4fc34fa 100755
--- a/netbeans-l10n-zip/src/ja/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30ad\u30fc\u30de\u30c3\u30d7\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-jdesktop-layout/org-jdesktop-layout/org/netbeans/libs/layoutext/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-jdesktop-layout/org-jdesktop-layout/org/netbeans/libs/layoutext/Bundle_ja.properties
index f79d818..d3ecab7 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-jdesktop-layout/org-jdesktop-layout/org/netbeans/libs/layoutext/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-jdesktop-layout/org-jdesktop-layout/org/netbeans/libs/layoutext/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/swing-layout/manifest.mf
 OpenIDE-Module-Name=Swing\u30ec\u30a4\u30a2\u30a6\u30c8\u62e1\u5f35\u7d71\u5408
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-annotations-common/org-netbeans-api-annotations-common/org/netbeans/annotations/common/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-annotations-common/org-netbeans-api-annotations-common/org/netbeans/annotations/common/resources/Bundle_ja.properties
index 5cca77d..445410f 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-annotations-common/org-netbeans-api-annotations-common/org/netbeans/annotations/common/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-annotations-common/org-netbeans-api-annotations-common/org/netbeans/annotations/common/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Long-Description=FindBugs\u3067\u4f7f\u7528\u3067\u304d\u308b@SuppressWarnings\u306a\u3069\u3001\u9759\u7684\u5206\u6790\u306b\u5f79\u7acb\u3064\u6ce8\u91c8\u304c\u542b\u307e\u308c\u307e\u3059\u3002
 OpenIDE-Module-Name=\u5171\u901a\u306e\u6ce8\u91c8
 OpenIDE-Module-Short-Description=\u6b20\u9665\u691c\u51fa\u306e\u305f\u3081\u306e\u5171\u901a\u306e\u6ce8\u91c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_ja.properties
index 156bbd2..6188843 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_ja.properties
@@ -1,42 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_Cancel=\u53d6\u6d88
 CTL_OK=OK
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=HTML UI API
 
 AlertTitle=\u8b66\u544a
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-intent/org-netbeans-api-intent/org/netbeans/api/intent/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-intent/org-netbeans-api-intent/org/netbeans/api/intent/Bundle_ja.properties
index a2c0804..685f589 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-intent/org-netbeans-api-intent/org/netbeans/api/intent/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-intent/org-netbeans-api-intent/org/netbeans/api/intent/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u767b\u9332\u3055\u308c\u3066\u3044\u308b\u30cf\u30f3\u30c9\u30e9\u306b\u3088\u308b\u610f\u56f3\u3057\u305f\u64cd\u4f5c(URI\u306a\u3069\u306e\u9069\u5207\u306a\u30bf\u30a4\u30d7\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3067\u8868\u3055\u308c\u308b)\u306e\u8d77\u52d5\u306e\u305f\u3081\u306eAPI\u3002\n\u610f\u56f3\u3057\u305f\u53ef\u80fd\u306a\u64cd\u4f5c\u306e\u30cf\u30f3\u30c9\u30e9\u306eSPI\u3002
 OpenIDE-Module-Name=\u610f\u56f3API
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-io/org-netbeans-api-io/org/netbeans/api/io/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-io/org-netbeans-api-io/org/netbeans/api/io/Bundle_ja.properties
index 5e54fa3..9735d31 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-io/org-netbeans-api-io/org/netbeans/api/io/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-io/org-netbeans-api-io/org/netbeans/api/io/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u51fa\u529b\u30da\u30a4\u30f3(\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30bf\u30d6\u306a\u3069)\u306e\u4f5c\u6210\u304a\u3088\u3073\u51fa\u529b\u30da\u30a4\u30f3\u3078\u306e\u30c7\u30fc\u30bf\u306e\u66f8\u8fbc\u307f\u306e\u305f\u3081\u306eAPI\u3002\n\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30ab\u30b9\u30bf\u30e0\u5b9f\u88c5\u306e\u305f\u3081\u306eSPI\u3002
 OpenIDE-Module-Name=I/O API\u304a\u3088\u3073SPI
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress-compat8/org-netbeans-api-progress-compat8/api/progress/compat8/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress-compat8/org-netbeans-api-progress-compat8/api/progress/compat8/Bundle_ja.properties
index cde5c29..08f8c77 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress-compat8/org-netbeans-api-progress-compat8/api/progress/compat8/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress-compat8/org-netbeans-api-progress-compat8/api/progress/compat8/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u30bf\u30b9\u30af\u306e\u9032\u6357\u72b6\u6cc1\u306e\u8996\u899a\u5316API\u306b\u5bfe\u3059\u308bNetBeans 8.0\u306e\u4e92\u63db\u6027\u3002
 OpenIDE-Module-Name=\u9032\u6357API 8.0\u4e92\u63db\u6027
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress-nb/org-netbeans-api-progress-nb/org/netbeans/api/progress/nb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress-nb/org-netbeans-api-progress-nb/org/netbeans/api/progress/nb/Bundle_ja.properties
index ff27aec..39ead92 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress-nb/org-netbeans-api-progress-nb/org/netbeans/api/progress/nb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress-nb/org-netbeans-api-progress-nb/org/netbeans/api/progress/nb/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=Swing\u56fa\u6709\u306e\u9032\u6357\u72b6\u6cc1\u306e\u8996\u899a\u5316API\u3002
 OpenIDE-Module-Name=\u9032\u6357API - Swing
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress/org-netbeans-api-progress/org/netbeans/progress/module/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress/org-netbeans-api-progress/org/netbeans/progress/module/resources/Bundle_ja.properties
index 8a78ef0..7d161d4 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress/org-netbeans-api-progress/org/netbeans/progress/module/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-progress/org-netbeans-api-progress/org/netbeans/progress/module/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u9032\u6357API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/api/search/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/api/search/Bundle_ja.properties
index aee1065..f5e45b8 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/api/search/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/api/search/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_MatchType_Basic_Wildcards=\u57fa\u672c\u30ef\u30a4\u30eb\u30c9\u30ab\u30fc\u30c9
 LBL_MatchType_Literal=\u30ea\u30c6\u30e9\u30eb
 LBL_MatchType_Regular_Expression=\u6b63\u898f\u8868\u73fe
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Name=\u691c\u7d22API
 OpenIDE-Module-Short-Description=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u306e\u691c\u7d22\u3092\u5236\u5fa1\u3057\u3001\u30ab\u30b9\u30bf\u30e0\u691c\u7d22\u30d7\u30ed\u30d0\u30a4\u30c0\u3092\u5b9f\u88c5\u3059\u308b\u305f\u3081\u306eAPI
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_ja.properties
index 4ab53e4..3cc0eef 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LBL_ContextView_ApplyAll=\u3059\u3079\u3066\u306e\u5927\u304d\u3044\u30d5\u30a1\u30a4\u30eb\u306b\u9069\u7528
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/ui/Bundle_ja.properties
index 9987eea..b5adbab 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 HideResultAction.displayName=\u975e\u8868\u793a
 MoreAction.name=\u305d\u306e\u4ed6
 RefreshAction.name=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-templates/org-netbeans-api-templates/org/netbeans/modules/templates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-templates/org-netbeans-api-templates/org/netbeans/modules/templates/Bundle_ja.properties
index 2516c2c..d2d1b40 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-templates/org-netbeans-api-templates/org/netbeans/modules/templates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-templates/org-netbeans-api-templates/org/netbeans/modules/templates/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306b\u57fa\u3065\u3044\u3066\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3059\u308b\u305f\u3081\u306eAPI\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u5185\u306e\u30b9\u30af\u30ea\u30d7\u30c6\u30a3\u30f3\u30b0\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210\u3092\u51e6\u7406\u3059\u308b\u30b3\u30fc\u30c9\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u53ef\u80fd\u306b\u3057\u305f\u308a\u3001\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u4f5c\u6210\u306e\u305f\u3081\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u307e\u305f\u306f\u74b0\u5883\u30c7\u30fc\u30bf\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30d5\u30a1\u30a4\u30eb\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-visual/org-netbeans-api-visual/org/netbeans/api/visual/widget/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-visual/org-netbeans-api-visual/org/netbeans/api/visual/widget/Bundle_ja.properties
index d3017d8..fa92a6c 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-visual/org-netbeans-api-visual/org/netbeans/api/visual/widget/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-visual/org-netbeans-api-visual/org/netbeans/api/visual/widget/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACS_SceneComponentName=\u30b7\u30fc\u30f3\u30fb\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8
 ACS_SceneComponentDesc=\u30b7\u30fc\u30f3\u30fb\u30d3\u30e5\u30fc
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-visual/org-netbeans-api-visual/org/netbeans/modules/visual/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-visual/org-netbeans-api-visual/org/netbeans/modules/visual/resources/Bundle_ja.properties
index af2d2f2..0371cbb 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-visual/org-netbeans-api-visual/org/netbeans/modules/visual/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-api-visual/org-netbeans-api-visual/org/netbeans/modules/visual/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Visual Library API
 OpenIDE-Module-Short-Description=Visual Library API
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-bootstrap/netbeans/lib/boot/org/netbeans/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-bootstrap/netbeans/lib/boot/org/netbeans/Bundle_ja.properties
index 89278ad..23c93e2 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-bootstrap/netbeans/lib/boot/org/netbeans/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-bootstrap/netbeans/lib/boot/org/netbeans/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Question to show user to find out whether start second instance of NetBeans  or not
 MSG_AlreadyRunning=\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u3001\u30e6\u30fc\u30b6\u30fc\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f7f\u7528\u3057\u3066\u3059\u3067\u306b\u52d5\u4f5c\u3057\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\n\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u524d\u56de\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u6b63\u3057\u304f\u7d42\u4e86\u3057\u306a\u304b\u3063\u305f\u304b\u3001\u5225\u306e\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067\u5225\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u52d5\u4f5c\u3057\u3066\u3044\u3066\n\u540c\u3058\u30e6\u30fc\u30b6\u30fc\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u304b\u306e\u3044\u305a\u308c\u304b\u3067\u3059\u3002\n\n\u540c\u3058\u30e6\u30fc\u30b6\u30fc\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u4f7f\u7528\u3057\u3066\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u5225\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u52d5\u4f5c\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\n\u30e6\u30fc\u30b6\u30fc\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u58ca\u308c\u306a\u3044\u3088\u3046\u306b\u3001\u300c\u53d6\u6d88\u300d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\u5225\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u52d5\u4f5c\u3057\u3066\u3044\u306a\u3044\u3053\u3068\u304c\u78ba\u5b9f\u306a\u5834\u5408\u306f\u300cOK\u300d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u7d9a\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/Bundle_ja.properties
index 477c7fa..a983f11 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # RunClassThread
 CTL_GeneratedName=\u51fa\u529b{0}
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/beaninfo/editors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/beaninfo/editors/Bundle_ja.properties
index 8d6b18d..ade1815 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/beaninfo/editors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/beaninfo/editors/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # NbProcessDescriptorCustomEditor
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/resources/Bundle_ja.properties
index e02a47f..88f7c09 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-execution/org-netbeans-core-execution/org/netbeans/core/execution/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30b3\u30a2 - \u5b9f\u884c
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-io-ui/org-netbeans-core-io-ui/org/netbeans/core/io/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-io-ui/org-netbeans-core-io-ui/org/netbeans/core/io/ui/Bundle_ja.properties
index 1b8ffdc..e55e157 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-io-ui/org-netbeans-core-io-ui/org/netbeans/core/io/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-io-ui/org-netbeans-core-io-ui/org/netbeans/core/io/ui/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=I/O UI
 
 #IOWindowAction
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/Bundle_ja.properties
index 3cbfb0a..67d310d 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u4ee3\u66ff\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30bf\u30d6\u914d\u7f6e(\u5de6/\u53f3/\u4e0b)\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002\u8907\u6570\u306e\u30bf\u30d6\u884c\u306a\u3069\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
 OpenIDE-Module-Name=\u8907\u6570\u30bf\u30d6
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/impl/Bundle_ja.properties
index 04c8535..7cad4d3 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/impl/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 BtnClose_Tooltip=<html>[Shift]+\u30af\u30ea\u30c3\u30af\u3067\u3059\u3079\u3066\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u9589\u3058\u308b<br>[Alt]+\u30af\u30ea\u30c3\u30af\u3067\u4ed6\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u9589\u3058\u308b
 
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/prefs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/prefs/Bundle_ja.properties
index 90dc83e..fbc19b6 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/prefs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multitabs/org-netbeans-core-multitabs/org/netbeans/core/multitabs/prefs/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 InnerTabsPanel.radioPlacementTop.text=\u4e0a(&O)
 InnerTabsPanel.radioPlacementLeft.text=\u5de6(&L)
 InnerTabsPanel.radioPlacementBottom.text=\u4e0b(&B)
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/Bundle_ja.properties
index 75746f7..8dc63f3 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_EditorsAction=\u30a8\u30c7\u30a3\u30bf(&E)
 CTL_EmptyViewName=\u7a7a
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/resources/Bundle_ja.properties
index 4480ac8..6405896 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/multiview/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30de\u30eb\u30c1\u30d3\u30e5\u30fc\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/Bundle_ja.properties
index 69229ea..56a901a 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_Discard=\u7834\u68c4(&D)
 CTL_Save=\u4fdd\u5b58
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/text/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/text/Bundle_ja.properties
index 67e319b..07d2803 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/text/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-multiview/org-netbeans-core-multiview/org/netbeans/core/spi/multiview/text/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - file name
 MSG_SaveModified=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u4fdd\u5b58\u3057\u307e\u3059\u304b\u3002
 MSG_SaveModified_no_name=\u30d5\u30a1\u30a4\u30eb\u306f\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u4fdd\u5b58\u3057\u307e\u3059\u304b\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-nativeaccess/org-netbeans-core-nativeaccess/org/netbeans/core/nativeaccess/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-nativeaccess/org-netbeans-core-nativeaccess/org/netbeans/core/nativeaccess/Bundle_ja.properties
index 8f5d857..638d453e 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-nativeaccess/org-netbeans-core-nativeaccess/org/netbeans/core/nativeaccess/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-nativeaccess/org-netbeans-core-nativeaccess/org/netbeans/core/nativeaccess/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/swing-layout/manifest.mf
 OpenIDE-Module-Name=\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30a2\u30af\u30bb\u30b9
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-netigso/org-netbeans-core-netigso/org/netbeans/core/netigso/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-netigso/org-netbeans-core-netigso/org/netbeans/core/netigso/Bundle_ja.properties
index cf006f5..01dc204 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-netigso/org-netbeans-core-netigso/org/netbeans/core/netigso/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-netigso/org-netbeans-core-netigso/org/netbeans/core/netigso/Bundle_ja.properties
@@ -6,46 +6,21 @@
 
 
 
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=NetBeans OSGi\u7d71\u5408
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-network/org-netbeans-core-network/org/netbeans/core/network/proxy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-network/org-netbeans-core-network/org/netbeans/core/network/proxy/Bundle_ja.properties
index ce4b71c..22690cb 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-network/org-netbeans-core-network/org/netbeans/core/network/proxy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-network/org-netbeans-core-network/org/netbeans/core/network/proxy/Bundle_ja.properties
@@ -1,38 +1,17 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30b3\u30a2\u30fb\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u8a2d\u5b9a
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-osgi/org-netbeans-core-osgi/org/netbeans/core/osgi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-osgi/org-netbeans-core-osgi/org/netbeans/core/osgi/Bundle_ja.properties
index e8f9691..dfcba75 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-osgi/org-netbeans-core-osgi/org/netbeans/core/osgi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-osgi/org-netbeans-core-osgi/org/netbeans/core/osgi/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=OSGi\u30e9\u30f3\u30bf\u30a4\u30e0\u306eNetBeans
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/Bundle_ja.properties
index bc8888d..24715d3 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/options/Bundle_ja.properties
index 9fe8258..93417b8 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/options/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AdvancedOption_DisplayName_OutputSettings=\u51fa\u529b
 AdvancedOption_Keywords_OutputSettings=\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30d5\u30a9\u30f3\u30c8\u8272
 KW_Background=\u80cc\u666f
@@ -8,43 +25,6 @@
 LBL_Description=\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u8a2d\u5b9a
 LBL_None=\u306a\u3057
 LBL_Underline=\u4e0b\u7dda
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OutputSettingsPanel.lblFontFamily.text=\u30d5\u30a9\u30f3\u30c8(&F):
 OutputSettingsPanel.lblFontSize.text=\u30d5\u30a9\u30f3\u30c8\u30fb\u30b5\u30a4\u30ba(&Z):
 OutputSettingsPanel.lblStandardColor.text=\u6a19\u6e96\u8272(&C):
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/ui/Bundle_ja.properties
index 779a455..3b0b1a0 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-output2/org-netbeans-core-output2/org/netbeans/core/output2/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_INPUT=\u5165\u529b(&I)
 LBL_EOF=\u5165\u529b\u3092\u9589\u3058\u308b(&C)
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup-base/netbeans/core/core-base/org/netbeans/core/startup/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup-base/netbeans/core/core-base/org/netbeans/core/startup/base/Bundle_ja.properties
index 982b27c..c415922 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup-base/netbeans/core/core-base/org/netbeans/core/startup/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup-base/netbeans/core/core-base/org/netbeans/core/startup/base/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Name=\u8d77\u52d5\u30d9\u30fc\u30b9
 OpenIDE-Module-Short-Description=NetBeans\u8d77\u52d5\u5171\u901a
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup-base/netbeans/core/core-base/org/netbeans/core/startup/layers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup-base/netbeans/core/core-base/org/netbeans/core/startup/layers/Bundle_ja.properties
index 06807bf..e2d95b1 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup-base/netbeans/core/core-base/org/netbeans/core/startup/layers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup-base/netbeans/core/core-base/org/netbeans/core/startup/layers/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_SystemFileSystem=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30b7\u30b9\u30c6\u30e0
 INSTANCE_FILES=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb
 # {0} - type
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ja.properties
index e6f0be7..0f97247 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_continue=\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u7121\u52b9\u5316\u3057\u3066\u7d9a\u884c
 MSG_exit=\u7d42\u4e86
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/impl/Bundle_ja.properties
index d483b09..7ad5b3c 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/impl/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MSG_start_load_cache=\u30ad\u30e3\u30c3\u30b7\u30e5\u3055\u308c\u3066\u3044\u308b\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d...
 MSG_end_load_cache=\u30ad\u30e3\u30c3\u30b7\u30e5\u3055\u308c\u3066\u3044\u308b\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d...\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/filetypes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/filetypes/Bundle_ja.properties
index 705bce2..0b16a94 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/filetypes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/filetypes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AdvancedOption.displayName=\u30d5\u30a1\u30a4\u30eb
 AdvancedOption.tooltip=\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ja.properties
index fbdff51..fd354a0 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #GeneralOptionsPanel
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/resources/Bundle_ja.properties
index 284c8c5..70e1382 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30b3\u30a2 - UI
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/sampler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/sampler/Bundle_ja.properties
index 1720667..b40e370 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/sampler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/sampler/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## Resource bundle for package org.netbeans.core.ui.sampler
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/sysopen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/sysopen/Bundle_ja.properties
index 8611f1b..338262e 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/sysopen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/sysopen/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SystemOpenAction=\u30b7\u30b9\u30c6\u30e0\u3067\u958b\u304f
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/warmup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/warmup/Bundle_ja.properties
index 0cbf99b..5e3a4f2 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/warmup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/warmup/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DiagnosticTask
 MEMORY=\u5408\u8a08\u7269\u7406\u30e1\u30e2\u30ea\u30fc{0}
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/Bundle_ja.properties
index 7d22cee..4a05e2c 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/actions/Bundle_ja.properties
index 7066748..72923cb 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CloneDocumentAction
 CTL_CloneDocumentAction=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u30af\u30ed\u30fc\u30f3(&L)
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/design/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/design/Bundle_ja.properties
index c25c3af..e8a3aae 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/design/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/design/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_DesignViewComponentTopComponent=\u30e2\u30fc\u30c9\u30fb\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8
 CTL_NewMode=\u65b0\u898f\u30e2\u30fc\u30c9
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/documentgroup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/documentgroup/Bundle_ja.properties
index 029d323..ceeadde 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/documentgroup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/documentgroup/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_CloseDocumentGroupAction=<\u306a\u3057>
 CTL_ManageGroupsAction=\u7ba1\u7406...
 CTL_NewGroupAction=\u65b0\u898f\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30b0\u30eb\u30fc\u30d7...
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 NewGroupPanel.cbKeepOpenedDocuments.text=\u73fe\u5728\u958b\u3044\u3066\u3044\u308b\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u4fdd\u6301
 NewGroupPanel.lblName.text=\u540d\u524d:
 ManageGroupsPanel.btnRemove.text=\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ja.properties
index e844399..07a1835 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 AdvancedOption_DisplayName_WinSys=\u30a6\u30a3\u30f3\u30c9\u30a6
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/persistence/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/persistence/Bundle_ja.properties
index 6a3c74e..8e7a7be 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/persistence/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/persistence/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #ModeData
 EXC_WindowManagerParse=\u30a6\u30a3\u30f3\u30c9\u30a6\u30fb\u30de\u30cd\u30fc\u30b8\u30e3{0}\u306e\u69cb\u6210\u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/resources/Bundle_ja.properties
index 25e8176..1c01eaf 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30b3\u30a2 - \u30a6\u30a3\u30f3\u30c9\u30a6
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/services/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/services/Bundle_ja.properties
index 8dd9c55..f226619 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/services/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/services/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ButtonBar/ButtonBarButton
 # Common Button labels
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ja.properties
index 2e6d915..f31792d 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # EditorAreaFrame
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/popupswitcher/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/popupswitcher/Bundle_ja.properties
index fbd3da0..953d44c 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/popupswitcher/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/popupswitcher/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACD_OTHER_EDITORS=\u305d\u306e\u4ed6\u306e\u30a8\u30c7\u30a3\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/tabcontrol/tabbedpane/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/tabcontrol/tabbedpane/Bundle_ja.properties
index dfdae4e..7a767ee 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/tabcontrol/tabbedpane/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/tabcontrol/tabbedpane/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BtnClose_Tooltip=<html>[Shift]+\u30af\u30ea\u30c3\u30af\u3067\u3059\u3079\u3066\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u9589\u3058\u308b<br>[Alt]+\u30af\u30ea\u30c3\u30af\u3067\u4ed6\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u9589\u3058\u308b
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/toolbars/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/toolbars/Bundle_ja.properties
index 6f18ae9..51bf42c 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/toolbars/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/toolbars/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #Small Icons Checkbox
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/beaninfo/editors/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/beaninfo/editors/Bundle_ja.properties
index 2448e90..452a836 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/beaninfo/editors/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/beaninfo/editors/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #DimensionEditor, InsertEditor, PointEditor, rectangleEditor common
 CTL_NegativeSize=\u30b5\u30a4\u30ba\u306f\u8ca0\u6570\u306b\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/Bundle_ja.properties
index 5e7e3f5..ec68a3f 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # core manifest
 OpenIDE-Module-Name=\u30b3\u30a2
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/actions/Bundle_ja.properties
index b6550bb..9f12346 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #AboutAction
 About=\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831(&A)
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/ui/Bundle_ja.properties
index edea030..43fbaaf 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-core/org-netbeans-core/org/netbeans/core/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 check_for_updates=\u66f4\u65b0\u306e\u78ba\u8a8d
 # Product Information panel
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-lib-uihandler/org-netbeans-lib-uihandler/org/netbeans/lib/uihandler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-lib-uihandler/org-netbeans-lib-uihandler/org/netbeans/lib/uihandler/Bundle_ja.properties
index 94d6b98..12adab1 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-lib-uihandler/org-netbeans-lib-uihandler/org/netbeans/lib/uihandler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-lib-uihandler/org-netbeans-lib-uihandler/org/netbeans/lib/uihandler/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Name=UI\u30cf\u30f3\u30c9\u30e9\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-asm/netbeans/core/org-netbeans-libs-asm/org/netbeans/libs/asm/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-asm/netbeans/core/org-netbeans-libs-asm/org/netbeans/libs/asm/Bundle_ja.properties
index 66d24f5..2333532 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-asm/netbeans/core/org-netbeans-libs-asm/org/netbeans/libs/asm/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-asm/netbeans/core/org-netbeans-libs-asm/org/netbeans/libs/asm/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=OW2 ASM
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-felix/org-netbeans-libs-felix/org/netbeans/libs/felix/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-felix/org-netbeans-libs-felix/org/netbeans/libs/felix/Bundle_ja.properties
index 04dd6dd..3f0aa75 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-felix/org-netbeans-libs-felix/org/netbeans/libs/felix/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-felix/org-netbeans-libs-felix/org/netbeans/libs/felix/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Apache\u306eFelix OSGi\u5b9f\u88c5
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-javafx/org-netbeans-libs-javafx/org/netbeans/libs/javafx/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-javafx/org-netbeans-libs-javafx/org/netbeans/libs/javafx/Bundle_ja.properties
index 0f1f3d6..0edb2da 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-javafx/org-netbeans-libs-javafx/org/netbeans/libs/javafx/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-javafx/org-netbeans-libs-javafx/org/netbeans/libs/javafx/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JavaFX\u30e9\u30c3\u30d1\u30fc
 OpenIDE-Module-Package-Dependency-Message=JavaFX\u30e9\u30a4\u30d6\u30e9\u30ea\u304cJDK\u5185\u306b\u3042\u308a\u307e\u305b\u3093\u3002JDK\u3092Oracle\u304b\u3089\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u304b\u3001\n\u4e00\u90e8\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u4f7f\u7528\u4e0d\u53ef\u306b\u3057\u3066\u7d9a\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jna-platform/org-netbeans-libs-jna-platform/org/netbeans/libs/jna/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jna-platform/org-netbeans-libs-jna-platform/org/netbeans/libs/jna/platform/Bundle_ja.properties
index 1e7ae55..5ea7cad 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jna-platform/org-netbeans-libs-jna-platform/org/netbeans/libs/jna/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jna-platform/org-netbeans-libs-jna-platform/org/netbeans/libs/jna/platform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/swing-layout/manifest.mf
 OpenIDE-Module-Name=JNA\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jna/org-netbeans-libs-jna/org/netbeans/libs/jna/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jna/org-netbeans-libs-jna/org/netbeans/libs/jna/Bundle_ja.properties
index 5bdae85..64066cb 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jna/org-netbeans-libs-jna/org/netbeans/libs/jna/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jna/org-netbeans-libs-jna/org/netbeans/libs/jna/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## libs/swing-layout/manifest.mf
 OpenIDE-Module-Name=JNA
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jsr223/org-netbeans-libs-jsr223/org/netbeans/libs/jsr223/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jsr223/org-netbeans-libs-jsr223/org/netbeans/libs/jsr223/Bundle_ja.properties
index a53d1b2..968963c 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jsr223/org-netbeans-libs-jsr223/org/netbeans/libs/jsr223/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-jsr223/org-netbeans-libs-jsr223/org/netbeans/libs/jsr223/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30b9\u30af\u30ea\u30d7\u30c8\u4f5c\u6210API\u306e\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ja.properties
index cdcf5ef..c1f863e 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JUnit 4
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-osgi/org-netbeans-libs-osgi/org/netbeans/libs/osgi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-osgi/org-netbeans-libs-osgi/org/netbeans/libs/osgi/Bundle_ja.properties
index 0ef9720..642978f 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-osgi/org-netbeans-libs-osgi/org/netbeans/libs/osgi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-osgi/org-netbeans-libs-osgi/org/netbeans/libs/osgi/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=OSGi\u4ed5\u69d8
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-testng/org-netbeans-libs-testng/org/netbeans/libs/testng/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-testng/org-netbeans-libs-testng/org/netbeans/libs/testng/Bundle_ja.properties
index c7662f6..6077cb2 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-testng/org-netbeans-libs-testng/org/netbeans/libs/testng/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-libs-testng/org-netbeans-libs-testng/org/netbeans/libs/testng/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=TestNG
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/Bundle_ja.properties
index 88976d2..a085eb6 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 CTL_QuickSearchAction=\u30af\u30a4\u30c3\u30af\u691c\u7d22
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/recent/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/recent/Bundle_ja.properties
index 4250529..76d02f6 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/recent/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/recent/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_SearchingRecentResult=\u30af\u30a4\u30c3\u30af\u691c\u7d22\u9805\u76ee\u3092\u691c\u7d22\u3057\u3066\u3044\u307e\u3059
 MSG_RecentResultNotFound=\u6700\u65b0\u306e\u691c\u7d22\u9805\u76ee\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 RecentSearches.clear=(\u6700\u8fd1\u306e\u691c\u7d22\u3092\u30af\u30ea\u30a2)
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/web/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/web/Bundle_ja.properties
index 439177c..9037b92 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/web/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/modules/quicksearch/web/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Err_CannotDisplayURL=URL\u3092\u8868\u793a\u3067\u304d\u307e\u305b\u3093: {0}
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/Bundle_ja.properties
index fca1378..41bfeac 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-spi-quicksearch/org-netbeans-spi-quicksearch/org/netbeans/spi/quicksearch/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Name=\u30af\u30a4\u30c3\u30af\u691c\u7d22API
 OpenIDE-Module-Short-Description=\u30e1\u30cb\u30e5\u30fc\u9805\u76ee\u3001\u30a2\u30af\u30b7\u30e7\u30f3\u3001\u30d5\u30a1\u30a4\u30eb\u306a\u3069\u3067\u306e\u30af\u30a4\u30c3\u30af\u691c\u7d22\u7528\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-outline/org-netbeans-swing-outline/org/netbeans/swing/etable/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-outline/org-netbeans-swing-outline/org/netbeans/swing/etable/Bundle_ja.properties
index 248f043..2526c0f 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-outline/org-netbeans-swing-outline/org/netbeans/swing/etable/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-outline/org-netbeans-swing-outline/org/netbeans/swing/etable/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_NoFilter=\u30d5\u30a3\u30eb\u30bf\u306a\u3057
 LBL_SelectVisibleColumns=\u53ef\u8996\u5217\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-outline/org-netbeans-swing-outline/org/netbeans/swing/outline/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-outline/org-netbeans-swing-outline/org/netbeans/swing/outline/Bundle_ja.properties
index 6c21cdc..79071c9 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-outline/org-netbeans-swing-outline/org/netbeans/swing/outline/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-outline/org-netbeans-swing-outline/org/netbeans/swing/outline/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Name=ETable\u3068\u30a2\u30a6\u30c8\u30e9\u30a4\u30f3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-plaf/org-netbeans-swing-plaf/org/netbeans/swing/plaf/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-plaf/org-netbeans-swing-plaf/org/netbeans/swing/plaf/Bundle_ja.properties
index 939f186..f0da21b 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-plaf/org-netbeans-swing-plaf/org/netbeans/swing/plaf/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-plaf/org-netbeans-swing-plaf/org/netbeans/swing/plaf/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30eb\u30c3\u30af\u30fb\u30a2\u30f3\u30c9\u30fb\u30d5\u30a3\u30fc\u30eb\u30fb\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-tabcontrol/org-netbeans-swing-tabcontrol/org/netbeans/swing/tabcontrol/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-tabcontrol/org-netbeans-swing-tabcontrol/org/netbeans/swing/tabcontrol/Bundle_ja.properties
index ae9f0eb..b38a760 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-tabcontrol/org-netbeans-swing-tabcontrol/org/netbeans/swing/tabcontrol/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-tabcontrol/org-netbeans-swing-tabcontrol/org/netbeans/swing/tabcontrol/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30bf\u30d6\u5236\u5fa1
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-tabcontrol/org-netbeans-swing-tabcontrol/org/netbeans/swing/tabcontrol/plaf/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-tabcontrol/org-netbeans-swing-tabcontrol/org/netbeans/swing/tabcontrol/plaf/Bundle_ja.properties
index 6fec3fc..5f23501 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-tabcontrol/org-netbeans-swing-tabcontrol/org/netbeans/swing/tabcontrol/plaf/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-netbeans-swing-tabcontrol/org-netbeans-swing-tabcontrol/org/netbeans/swing/tabcontrol/plaf/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 Tip_Show_Opened_Documents_List=\u958b\u3044\u3066\u3044\u308b\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u30ea\u30b9\u30c8\u3092\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-actions/org-openide-actions/org/openide/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-actions/org-openide-actions/org/openide/actions/Bundle_ja.properties
index ad14a10..04e5af9 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-actions/org-openide-actions/org/openide/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-actions/org-openide-actions/org/openide/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 LAB_ToolsActionInitializing=\u521d\u671f\u5316\u3057\u3066\u3044\u307e\u3059...
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-awt/org-openide-awt/org/netbeans/modules/openide/awt/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-awt/org-openide-awt/org/netbeans/modules/openide/awt/Bundle_ja.properties
index 06c6228..c6d8194 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-awt/org-openide-awt/org/netbeans/modules/openide/awt/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-awt/org-openide-awt/org/netbeans/modules/openide/awt/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 HINT_Menu=\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u30e1\u30cb\u30e5\u30fc\u306b\u767b\u9332
 HINT_Toolbars=\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u30c4\u30fc\u30eb\u30d0\u30fc\u306b\u767b\u9332
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-awt/org-openide-awt/org/openide/awt/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-awt/org-openide-awt/org/openide/awt/Bundle_ja.properties
index fcc0865..35cc3ea 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-awt/org-openide-awt/org/openide/awt/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-awt/org-openide-awt/org/openide/awt/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-compat/org-openide-compat/org/openide/compat/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-compat/org-openide-compat/org/openide/compat/Bundle_ja.properties
index 4cf148b..73c8022 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-compat/org-openide-compat/org/openide/compat/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-compat/org-openide-compat/org/openide/compat/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u4e92\u63db\u6027API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-dialogs/org-openide-dialogs/org/openide/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-dialogs/org-openide-dialogs/org/openide/Bundle_ja.properties
index f1e8c0d..f554b8b 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-dialogs/org-openide-dialogs/org/openide/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-dialogs/org-openide-dialogs/org/openide/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30c0\u30a4\u30a2\u30ed\u30b0API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-execution-compat8/org-openide-execution-compat8/org/openide/execution/compat8/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-execution-compat8/org-openide-execution-compat8/org/openide/execution/compat8/Bundle_ja.properties
index 2568eb1..2cac78b 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-execution-compat8/org-openide-execution-compat8/org/openide/execution/compat8/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-execution-compat8/org-openide-execution-compat8/org/openide/execution/compat8/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u5b9f\u884cAPI 8.0\u4e92\u63db\u6027
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Short-Description=\u30d0\u30fc\u30b8\u30e7\u30f38.0\u4ee5\u524d\u306e\u5b9f\u884cAPI\u306b\u5bfe\u3057\u3066\u30b3\u30f3\u30d1\u30a4\u30eb\u3055\u308c\u305f\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306e\u4e92\u63db\u6027\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-execution/org-openide-execution/org/openide/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-execution/org-openide-execution/org/openide/execution/Bundle_ja.properties
index 1bcfef3..cd5388c 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-execution/org-openide-execution/org/openide/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-execution/org-openide-execution/org/openide/execution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u5b9f\u884cAPI
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/netbeans/modules/openide/explorer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/netbeans/modules/openide/explorer/Bundle_ja.properties
index 0a9c789..6a4e552 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/netbeans/modules/openide/explorer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/netbeans/modules/openide/explorer/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - name
 MSG_ConfirmDeleteObject={0}\u3092\u524a\u9664\u3057\u3066\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
 # {0} - number of objects
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/Bundle_ja.properties
index ff155fc..828831b 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/propertysheet/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/propertysheet/Bundle_ja.properties
index d9e7c85..a865a0e 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/propertysheet/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/propertysheet/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #PropertyDisplayer
 PS_ExcIn=\u4f8b\u5916
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/view/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/view/Bundle_ja.properties
index a42274e..cc46e9d 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/view/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/view/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems-compat8/netbeans/core/org-openide-filesystems-compat8/org/openide/filesystems/compat8/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems-compat8/netbeans/core/org-openide-filesystems-compat8/org/openide/filesystems/compat8/Bundle_ja.properties
index 1357a09..0524389 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems-compat8/netbeans/core/org-openide-filesystems-compat8/org/openide/filesystems/compat8/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems-compat8/netbeans/core/org-openide-filesystems-compat8/org/openide/filesystems/compat8/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=NetBeans 8.0\u30ea\u30ea\u30fc\u30b9\u4ee5\u964d\u3001\u975e\u63a8\u5968\u304a\u3088\u3073\u65e7\u5f0f\u306e\u6a5f\u80fd\u304c\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0API\u30e1\u30a4\u30f3\u30e9\u30a4\u30f3\u304b\u3089\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002\u30d0\u30a4\u30ca\u30ea\u4e92\u63db\u6027\u3092\u7dad\u6301\u3059\u308b\u305f\u3081\u306b\u3001\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u3089\u306e\u5b9f\u88c5\u304c\u5b9f\u884c\u6642\u306b\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0API\u30af\u30e9\u30b9\u306b\u30a4\u30f3\u30b8\u30a7\u30af\u30c8\u3055\u308c\u3001\u53e4\u3044\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0API\u306b\u5bfe\u3057\u3066\u30b3\u30f3\u30d1\u30a4\u30eb\u3055\u308c\u305f\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5b9f\u884c\u304c\u53ef\u80fd\u306b\u306a\u308a\u307e\u3059
 OpenIDE-Module-Name=\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0API 8.0\u4e92\u63db\u6027
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems-nb/org-openide-filesystems-nb/org/openide/filesystems/nb/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems-nb/org-openide-filesystems-nb/org/openide/filesystems/nb/Bundle_ja.properties
index 7e20b39..c313cae 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems-nb/org-openide-filesystems-nb/org/openide/filesystems/nb/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems-nb/org-openide-filesystems-nb/org/openide/filesystems/nb/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=RCP\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
 OpenIDE-Module-Long-Description=\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0API\u306f\u3001\u4efb\u610f\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u3067\u306e\u30b5\u30dd\u30fc\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u3068\u3057\u3066\u4f7f\u7528\u3055\u308c\u308b\u305f\u3081\u306b(javax.swing\u3092\u306f\u3058\u3081\u3068\u3059\u308b)\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u306e\u4f9d\u5b58\u6027\u304b\u3089\u72ec\u7acb\u3057\u305f\u307e\u307e\u3067\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002Swing UI\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u4f7f\u7528\u3059\u308b\u30af\u30e9\u30b9\u306f\u9664\u5916\u3055\u308c\u3001\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u542b\u3081\u3089\u308c\u307e\u3057\u305f\u3002
 OpenIDE-Module-Name=\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0NetBeans\u30af\u30e9\u30a4\u30a2\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/netbeans/modules/openide/filesystems/declmime/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/netbeans/modules/openide/filesystems/declmime/Bundle_ja.properties
index 2a6564e..e575c5a 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/netbeans/modules/openide/filesystems/declmime/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/netbeans/modules/openide/filesystems/declmime/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Invalid_XML_document=\u7121\u52b9\u306aXML\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8:
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_ja.properties
index 9744ccd..f4c16a5 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-io/org-openide-io/org/openide/io/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-io/org-openide-io/org/openide/io/Bundle_ja.properties
index 97c55a1..131073d 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-io/org-openide-io/org/openide/io/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-io/org-openide-io/org/openide/io/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_STDOUT=\u6a19\u6e96\u51fa\u529b
 OpenIDE-Module-Name=I/O API - Swing
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-loaders/org-openide-loaders/org/netbeans/modules/templates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-loaders/org-openide-loaders/org/netbeans/modules/templates/Bundle_ja.properties
index 195b552..984e0f7 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-loaders/org-openide-loaders/org/netbeans/modules/templates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-loaders/org-openide-loaders/org/netbeans/modules/templates/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u30c7\u30fc\u30bf\u30b7\u30b9\u30c6\u30e0API\u306b\u30b9\u30af\u30ea\u30d7\u30c8\u4f5c\u6210API\u3092\u30d0\u30a4\u30f3\u30c9\u3057\u307e\u3059\u3002\u305d\u306e\u7d50\u679c\u3001\u4efb\u610f\u306e\u30b9\u30af\u30ea\u30d7\u30c8\u4f5c\u6210\u304a\u3088\u3073\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u4f5c\u6210\u8a00\u8a9e\u3092\u4f7f\u7528\u3057\u3066\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u4f5c\u6210\u3059\u308b\u3053\u3068\u304c\u53ef\u80fd\u3067\u3059\u3002
 OpenIDE-Module-Name=\u8a73\u7d30\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u4f5c\u6210
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_ja.properties
index ce70fce..d8bf9f0 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_SettingsFile=\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb
 # {0} - the path
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-modules/netbeans/lib/org-openide-modules/org/openide/modules/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-modules/netbeans/lib/org-openide-modules/org/openide/modules/Bundle_ja.properties
index 3013cec..394cef0 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-modules/netbeans/lib/org-openide-modules/org/openide/modules/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-modules/netbeans/lib/org-openide-modules/org/openide/modules/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest
 OpenIDE-Module-Name=\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0API
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-nodes/org-openide-nodes/org/openide/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-nodes/org-openide-nodes/org/openide/nodes/Bundle_ja.properties
index e993386..683eced 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-nodes/org-openide-nodes/org/openide/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-nodes/org-openide-nodes/org/openide/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-options/org-openide-options/org/openide/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-options/org-openide-options/org/openide/options/Bundle_ja.properties
index 77a3754..38007ba 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-options/org-openide-options/org/openide/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-options/org-openide-options/org/openide/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-text/org-openide-text/org/openide/text/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-text/org-openide-text/org/openide/text/Bundle_ja.properties
index 41692d3..fe8eb98 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-text/org-openide-text/org/openide/text/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-text/org-openide-text/org/openide/text/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-util-enumerations/org-openide-util-enumerations/org/openide/util/enum/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-util-enumerations/org-openide-util-enumerations/org/openide/util/enum/Bundle_ja.properties
index 7320c6b..444cc25 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-util-enumerations/org-openide-util-enumerations/org/openide/util/enum/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-util-enumerations/org-openide-util-enumerations/org/openide/util/enum/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest
 OpenIDE-Module-Name=\u65e7\u5217\u6319API
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-util-lookup/netbeans/lib/org-openide-util-lookup/org/openide/util/lookup/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-util-lookup/netbeans/lib/org-openide-util-lookup/org/openide/util/lookup/Bundle_ja.properties
index 77f698b..471aea3 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-util-lookup/netbeans/lib/org-openide-util-lookup/org/openide/util/lookup/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-util-lookup/netbeans/lib/org-openide-util-lookup/org/openide/util/lookup/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Long-Description=NetBeans\u306e\u591a\u304f\u306eAPI\u306f\u3001\u76e3\u8996\u53ef\u80fd\u306a\u30b5\u30fc\u30d3\u30b9\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3068\u3057\u3066\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u306f\u30b0\u30ed\u30fc\u30d0\u30eb\u30fb\u30b5\u30fc\u30d3\u30b9\u30fb\u30ec\u30b8\u30b9\u30c8\u30ea\u3067\u3059\u3002\u9078\u629e\u5185\u5bb9\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u6a5f\u80fd\u306a\u3069\u3082\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u30fb\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3068\u3057\u3066\u30e2\u30c7\u30eb\u5316\u3055\u308c\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30eb\u30c3\u30af\u30a2\u30c3\u30d7API
 OpenIDE-Module-Short-Description=NetBeans\u5168\u4f53\u3067\u4f7f\u7528\u3055\u308c\u308b\u3001\u6c4e\u7528\u7684\u306a\u30b5\u30fc\u30d3\u30b9\u691c\u51fa\u30e1\u30ab\u30cb\u30ba\u30e0\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-util-ui/netbeans/lib/org-openide-util-ui/org/openide/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-util-ui/netbeans/lib/org-openide-util-ui/org/openide/util/Bundle_ja.properties
index db5b3ec..553f4df 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-util-ui/netbeans/lib/org-openide-util-ui/org/openide/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-util-ui/netbeans/lib/org-openide-util-ui/org/openide/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest
 OpenIDE-Module-Name=\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3API
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-util-ui/netbeans/lib/org-openide-util-ui/org/openide/util/datatransfer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-util-ui/netbeans/lib/org-openide-util-ui/org/openide/util/datatransfer/Bundle_ja.properties
index ead6aba..ba4b372 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-util-ui/netbeans/lib/org-openide-util-ui/org/openide/util/datatransfer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-util-ui/netbeans/lib/org-openide-util-ui/org/openide/util/datatransfer/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-util/netbeans/lib/org-openide-util/org/openide/util/base/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-util/netbeans/lib/org-openide-util/org/openide/util/base/Bundle_ja.properties
index 430280a..08120f3 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-util/netbeans/lib/org-openide-util/org/openide/util/base/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-util/netbeans/lib/org-openide-util/org/openide/util/base/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30d9\u30fc\u30b9\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3API
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Short-Description=\u30d9\u30fc\u30b9\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3API\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/org-openide-windows/org-openide-windows/org/openide/windows/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/org-openide-windows/org-openide-windows/org/openide/windows/Bundle_ja.properties
index 2fdff7a..3c2bd2b 100755
--- a/netbeans-l10n-zip/src/ja/platform/org-openide-windows/org-openide-windows/org/openide/windows/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/org-openide-windows/org-openide-windows/org/openide/windows/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # manifest
diff --git a/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/action/Bundle_ja.properties
index 25a4612..45acf2c 100755
--- a/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/action/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # PageSetupAction
 LBL_PageSetup_Action=\u30da\u30fc\u30b8\u8a2d\u5b9a(&G)...
diff --git a/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/resources/Bundle_ja.properties
index 0d5ceec..a29c337 100755
--- a/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/resources/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # manifest
 OpenIDE-Module-Name=\u5370\u5237
diff --git a/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/ui/Bundle_ja.properties
index c320b67..5e9c04f 100755
--- a/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/ui/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Preview
 # {0} - exception message
diff --git a/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/util/Bundle_ja.properties
index e36ced1..126b96f 100755
--- a/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/print/print/org/netbeans/modules/print/util/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Config
 # {0} - page number
diff --git a/netbeans-l10n-zip/src/ja/platform/progress-ui/progress-ui/org/netbeans/modules/progress/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/progress-ui/progress-ui/org/netbeans/modules/progress/ui/Bundle_ja.properties
index a33212e..042d86f 100755
--- a/netbeans-l10n-zip/src/ja/platform/progress-ui/progress-ui/org/netbeans/modules/progress/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/progress-ui/progress-ui/org/netbeans/modules/progress/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u9032\u6357UI
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/queries/queries/org/netbeans/modules/queries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/queries/queries/org/netbeans/modules/queries/Bundle_ja.properties
index 91f9a14..7e917b6 100755
--- a/netbeans-l10n-zip/src/ja/platform/queries/queries/org/netbeans/modules/queries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/queries/queries/org/netbeans/modules/queries/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u6c4e\u7528\u554f\u5408\u305bAPI
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
diff --git a/netbeans-l10n-zip/src/ja/platform/sampler/sampler/org/netbeans/modules/sampler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/sampler/sampler/org/netbeans/modules/sampler/Bundle_ja.properties
index 05ca820..b63ddd7 100755
--- a/netbeans-l10n-zip/src/ja/platform/sampler/sampler/org/netbeans/modules/sampler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/sampler/sampler/org/netbeans/modules/sampler/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=\u30b5\u30f3\u30d7\u30e9
 Save_Progress=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3092\u4fdd\u5b58\u3057\u3066\u3044\u307e\u3059
 SelfSamplerAction_SavedFile=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u304c{0}\u306b\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/platform/sendopts/sendopts/org/netbeans/api/sendopts/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/sendopts/sendopts/org/netbeans/api/sendopts/Bundle_ja.properties
index 371863d..e182372 100755
--- a/netbeans-l10n-zip/src/ja/platform/sendopts/sendopts/org/netbeans/api/sendopts/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/sendopts/sendopts/org/netbeans/api/sendopts/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - name of the option, like --help or -h
 MSG_MissingArgument=\u30aa\u30d7\u30b7\u30e7\u30f3{0}\u306b\u306f\u5f15\u6570\u304c\u5fc5\u8981\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/platform/sendopts/sendopts/org/netbeans/modules/sendopts/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/sendopts/sendopts/org/netbeans/modules/sendopts/Bundle_ja.properties
index 5ab8e58..153c771 100755
--- a/netbeans-l10n-zip/src/ja/platform/sendopts/sendopts/org/netbeans/modules/sendopts/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/sendopts/sendopts/org/netbeans/modules/sendopts/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u30b3\u30de\u30f3\u30c9\u884c\u89e3\u6790API
 OpenIDE-Module-Short-Description=\u30b3\u30de\u30f3\u30c9\u884c\u89e3\u6790\u7528GetOpts\u6e96\u62e0API
diff --git a/netbeans-l10n-zip/src/ja/platform/settings/settings/org/netbeans/modules/settings/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/settings/settings/org/netbeans/modules/settings/resources/Bundle_ja.properties
index dde58fc..518ce01 100755
--- a/netbeans-l10n-zip/src/ja/platform/settings/settings/org/netbeans/modules/settings/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/settings/settings/org/netbeans/modules/settings/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=\u8a2d\u5b9aAPI
 OpenIDE-Module-Short-Description=\u30ab\u30b9\u30bf\u30e0\u66f8\u5f0f\u3067\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306e\u30e9\u30a4\u30d6\u30e9\u30ea\u3067\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/platform/spi-actions/spi-actions/org/netbeans/spi/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/spi-actions/spi-actions/org/netbeans/spi/actions/Bundle_ja.properties
index 5c1d3b1..cd0b667 100755
--- a/netbeans-l10n-zip/src/ja/platform/spi-actions/spi-actions/org/netbeans/spi/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/spi-actions/spi-actions/org/netbeans/spi/actions/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
 OpenIDE-Module-Long-Description=NodeAction\u3001CookieAction\u306a\u3069\u3092\u7f6e\u63db\u3059\u308b\u65b0\u898fAPI\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=\u30a2\u30af\u30b7\u30e7\u30f3SPI (\u8a66\u9a13\u6bb5\u968e)
diff --git a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/Bundle_ja.properties
index 9c1130d..1ab04bc 100755
--- a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Manifest localization
 OpenIDE-Module-Name=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/actions/Bundle_ja.properties
index 334ba2c..09e9c00 100755
--- a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # TemplatesAction
 BTN_TemplatesPanel_CloseButton=\u9589\u3058\u308b(&C)
diff --git a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/Bundle_ja.properties
index b222e01..049d6f3 100755
--- a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Other=\u305d\u306e\u4ed6
 Templates/Properties=\u30e6\u30fc\u30b6\u30fc\u69cb\u6210\u30d7\u30ed\u30d1\u30c6\u30a3
diff --git a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/templatesFile_ja.html b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/templatesFile_ja.html
index 5d1d986..0dfe600 100755
--- a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/templatesFile_ja.html
+++ b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/templatesFile_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/templatesFolder_ja.html b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/templatesFolder_ja.html
index 80b7b1c..961b962 100755
--- a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/templatesFolder_ja.html
+++ b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/resources/templatesFolder_ja.html
@@ -1,42 +1,23 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-  -->
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_ja.properties
index 75efdfb..258d870 100755
--- a/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Action_Rename=\u540d\u524d\u306e\u5909\u66f4(&R)
 BTN_TemplatesPanel_Add=\u8ffd\u52a0(&A)...
diff --git a/netbeans-l10n-zip/src/ja/platform/templatesui/templatesui/org/netbeans/modules/templatesui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/templatesui/templatesui/org/netbeans/modules/templatesui/Bundle_ja.properties
index 2f94a79..4cd5bc7 100755
--- a/netbeans-l10n-zip/src/ja/platform/templatesui/templatesui/org/netbeans/modules/templatesui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/templatesui/templatesui/org/netbeans/modules/templatesui/Bundle_ja.properties
@@ -1,44 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_TargetPanel_Name=\u540d\u524d\u3068\u5834\u6240
 LBL_TemplatesPanel_Name=\u30d5\u30a1\u30a4\u30eb\u30fb\u30bf\u30a4\u30d7\u3092\u9078\u629e
 # {0} - current index
 # {1} - number of panels
 MSG_HTMLWizardName={0}/{1}
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=\u30d5\u30a1\u30a4\u30eb\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8HTML UI
 
diff --git a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_ja.properties
index c744d23..96b03d6 100755
--- a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_ReporterResultAction=\u4f8b\u5916\u30ec\u30dd\u30fc\u30bf(&X)
 CTL_ReporterResultTopComponent=\u4f8b\u5916\u30ec\u30dd\u30fc\u30bf
diff --git a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_ja.properties
index 03bfdd0..be25ab1 100755
--- a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Actions/Window/org-netbeans-modules-exceptions-ReporterResultAction.instance=ReporterResult
 BTN_ReviewAndReport=\u554f\u984c\u306e\u78ba\u8a8d\u3068\u5831\u544a(&R)
diff --git a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Connecting_ja.html b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Connecting_ja.html
index 6de855c..fd78e1f 100755
--- a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Connecting_ja.html
+++ b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Connecting_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
diff --git a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/SAXException_ja.html b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/SAXException_ja.html
index 4458310..4d848a9 100755
--- a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/SAXException_ja.html
+++ b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/SAXException_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
diff --git a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/UnknownHostException_ja.html b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/UnknownHostException_ja.html
index 316e109..7785dc8 100755
--- a/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/UnknownHostException_ja.html
+++ b/netbeans-l10n-zip/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/UnknownHostException_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
diff --git a/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/Bundle_ja.properties
index aae3e68..67894f6 100755
--- a/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #manifest's description entries
diff --git a/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/actions/Bundle_ja.properties
index a79f200..564a270 100755
--- a/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 #classesViewAction
diff --git a/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/models/Bundle_ja.properties
index 3a500d0..2c23115 100755
--- a/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/models/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # HeapActionsFilter
 CTL_References_Label=\u53c2\u7167\u3092\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/views/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/views/Bundle_ja.properties
index 7dac2b4..6a2bfc8 100755
--- a/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/views/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/debugger-jpda-heapwalk/debugger-jpda-heapwalk/org/netbeans/modules/debugger/jpda/heapwalk/views/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #ClassesView
 CTL_Classes_view=\u30ed\u30fc\u30c9\u3055\u308c\u305f\u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/profiler/maven-profiler/maven-profiler/org/netbeans/modules/maven/profiler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/maven-profiler/maven-profiler/org/netbeans/modules/maven/profiler/Bundle_ja.properties
index 62992eb..1ec664d 100755
--- a/netbeans-l10n-zip/src/ja/profiler/maven-profiler/maven-profiler/org/netbeans/modules/maven/profiler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/maven-profiler/maven-profiler/org/netbeans/modules/maven/profiler/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Maven
 OpenIDE-Module-Name=Maven\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-charts/org-netbeans-lib-profiler-charts/org/netbeans/lib/profiler/charts/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-charts/org-netbeans-lib-profiler-charts/org/netbeans/lib/profiler/charts/Bundle_ja.properties
index 0f7ed5d..ae722d5 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-charts/org-netbeans-lib-profiler-charts/org/netbeans/lib/profiler/charts/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-charts/org-netbeans-lib-profiler-charts/org/netbeans/lib/profiler/charts/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(\u56f3)
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/Bundle_ja.properties
index 691abe7..d0207e8 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/filters/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/filters/Bundle_ja.properties
index d77bb0e..23befb5 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/filters/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/filters/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/integration/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/integration/Bundle_ja.properties
index 52b1aee..25e6ab1 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/integration/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-common/org-netbeans-lib-profiler-common/org/netbeans/lib/profiler/common/integration/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 IntegrationUtils_PlatformJava50=Java SE 5.0 (Update 4\u4ee5\u964d)
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/Bundle_ja.properties
index b44e84b..6f67bce 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(JFluid-UI)
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/charts/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/charts/Bundle_ja.properties
index 1cb5884..4cb43b5 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/charts/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/charts/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SynchronousXYChart_FitToWindowString=\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u5408\u308f\u305b\u308b
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/charts/xy/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/charts/xy/Bundle_ja.properties
index 8e154b8..6c6500a 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/charts/xy/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/charts/xy/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ProfilerXYChart_ZoomInString=\u62e1\u5927(\u30de\u30a6\u30b9\u306e\u30db\u30a4\u30fc\u30eb)
 ProfilerXYChart_ZoomOutString=\u7e2e\u5c0f(\u30de\u30a6\u30b9\u306e\u30db\u30a4\u30fc\u30eb)
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/components/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/components/Bundle_ja.properties
index 1609bad..1080963 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/components/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/components/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #FilterComponent_DefaultTextFieldString=[Filter]
 #FilterComponent_InvalidRegExpString=Invalid regular expression!
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/cpu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/cpu/Bundle_ja.properties
index 3770f50..5abfb17 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/cpu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/cpu/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CCTDisplay_MethodColumnName=\u547c\u51fa\u3057\u30c4\u30ea\u30fc - \u30e1\u30bd\u30c3\u30c9
 CCTDisplay_MethodColumnToolTip=\u547c\u51fa\u3057\u30c4\u30ea\u30fc - \u30e1\u30bd\u30c3\u30c9\u547c\u51fa\u3057
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/graphs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/graphs/Bundle_ja.properties
index af3c0e9..ee0d00e 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/graphs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/graphs/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GraphPanel_NoDataTooltip=<\u30c7\u30fc\u30bf\u304c\u3042\u308a\u307e\u305b\u3093>
 # Max value of the provided metrics, default EN: Max {Metrics Name} example: Max Live Bytes
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/jdbc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/jdbc/Bundle_ja.properties
index bef8282..200e6ba 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/jdbc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/jdbc/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 JDBCView_ColumnName=SQL\u554f\u5408\u305b
 JDBCView_TimeColumnName=\u5408\u8a08\u6642\u9593
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/locks/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/locks/Bundle_ja.properties
index 31c83b9..0792012 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/locks/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/locks/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LockContentionPanel_EnableLocksMonitoring=\u30ed\u30c3\u30af\u7af6\u5408\u30e2\u30cb\u30bf\u30ea\u30f3\u30b0\u306f\u73fe\u5728\u7121\u52b9\u3067\u3059\u3002\u6709\u52b9\u306b\u3059\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u307e\u3059:
 LockContentionPanel_EnableLocksMonitoringToolTip=\u3053\u306e\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u30ed\u30c3\u30af\u7af6\u5408\u30e2\u30cb\u30bf\u30ea\u30f3\u30b0\u3092\u6709\u52b9\u5316\u3059\u308b\u306b\u306f\u3053\u308c\u3092\u62bc\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/memory/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/memory/Bundle_ja.properties
index 411324a..ab22996 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/memory/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/memory/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SampledResultsPanel_FilterMenuItemName=\u30d5\u30a3\u30eb\u30bf
 SampledResultsPanel_GoSourcePopupItemName=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/swing/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/swing/Bundle_ja.properties
index c664ed9..53c579c 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/swing/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/swing/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ExportUtils_ButtonExport=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
 ExportUtils_NpsFile=\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u30fb\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/threads/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/threads/Bundle_ja.properties
index 7ab761f..f2dfa83 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/threads/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler-ui/org-netbeans-lib-profiler-ui/org/netbeans/lib/profiler/ui/threads/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACT_ZoomIn=\u62e1\u5927
 ACT_ZoomOut=\u7e2e\u5c0f
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/netbeans/lib/jfluid-server/org/netbeans/lib/profiler/global/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/netbeans/lib/jfluid-server/org/netbeans/lib/profiler/global/Bundle_ja.properties
index 11a17cf..29e471a 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/netbeans/lib/jfluid-server/org/netbeans/lib/profiler/global/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/netbeans/lib/jfluid-server/org/netbeans/lib/profiler/global/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CalibrationDataFileIO_CalibrationFileNotExistMsg=\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u8abf\u6574\u30c7\u30fc\u30bf\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u307e\u305b\u3093:\n{0}
 CalibrationDataFileIO_CalibrationFileNotReadableMsg=\u4fdd\u5b58\u6e08\u8abf\u6574\u30c7\u30fc\u30bf\u30fb\u30d5\u30a1\u30a4\u30eb\n{0}\n\u304c\u5b58\u5728\u3057\u307e\u3059\u304c\u3001\u8aad\u53d6\u308a\u4e0d\u53ef\u3067\u3059\u3002\n\u8aad\u53d6\u308a\u53ef\u80fd\u306b\u3059\u308b\u304b\u3001\u524a\u9664\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/netbeans/lib/jfluid-server/org/netbeans/lib/profiler/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/netbeans/lib/jfluid-server/org/netbeans/lib/profiler/server/Bundle_ja.properties
index fad43ca..03db12b 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/netbeans/lib/jfluid-server/org/netbeans/lib/profiler/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/netbeans/lib/jfluid-server/org/netbeans/lib/profiler/server/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ProfilerCalibrator_CannotSaveCalibrationDataMsg=\u8abf\u6574\u306b\u6210\u529f\u3057\u307e\u3057\u305f\u304c\u3001\u8abf\u6574\u30c7\u30fc\u30bf\u3092\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f:\n{0}
 ProfilerCalibrator_CalibrationSuccessMsg=\u8abf\u6574\u306b\u6210\u529f\u3057\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/Bundle_ja.properties
index d6994dd..a9b001d 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(JFluid)
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/global/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/global/Bundle_ja.properties
index 11a17cf..29e471a 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/global/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/global/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CalibrationDataFileIO_CalibrationFileNotExistMsg=\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u8abf\u6574\u30c7\u30fc\u30bf\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u307e\u305b\u3093:\n{0}
 CalibrationDataFileIO_CalibrationFileNotReadableMsg=\u4fdd\u5b58\u6e08\u8abf\u6574\u30c7\u30fc\u30bf\u30fb\u30d5\u30a1\u30a4\u30eb\n{0}\n\u304c\u5b58\u5728\u3057\u307e\u3059\u304c\u3001\u8aad\u53d6\u308a\u4e0d\u53ef\u3067\u3059\u3002\n\u8aad\u53d6\u308a\u53ef\u80fd\u306b\u3059\u308b\u304b\u3001\u524a\u9664\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/heap/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/heap/Bundle_ja.properties
index 0ab83d0..6854849 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/heap/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/heap/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 HprofByteBuffer_ShortFile=\u30d5\u30a1\u30a4\u30eb\u304c\u5c0f\u3055\u3059\u304e\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/instrumentation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/instrumentation/Bundle_ja.properties
index 949ee11..d9ad2b6 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/instrumentation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/instrumentation/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BadLocationException_CannotFindMethodCursorMsg=\u6307\u5b9a\u3055\u308c\u305f\u30bd\u30fc\u30b9\u884c\u306b\u30e1\u30bd\u30c3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\n\u30ab\u30fc\u30bd\u30eb\u304c\u7f6e\u304b\u308c\u3066\u3044\u308b\u884c\u304c"{"\u304b"}"\u3001\u3042\u308b\u3044\u306f"do {"\u3084"try {"\u6587\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u304b?
 BadLocationException_CannotFindMethodSelectionMsg=\u6307\u5b9a\u3055\u308c\u305f\u30bd\u30fc\u30b9\u884c\u306b\u30e1\u30bd\u30c3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\n\u9078\u629e\u7bc4\u56f2\u306e\u5148\u982d\u307e\u305f\u306f\u6700\u7d42\u884c\u304c"{"\u304b"}"\u3001\n\u3042\u308b\u3044\u306f"do {"\u3084"try {"\u306a\u3069\u306e\u6587\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u304b?
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/Bundle_ja.properties
index 8ab07c1..8276e9e 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FilteringSupport_FilteredOutLbl=\u9664\u53bb
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/coderegion/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/coderegion/Bundle_ja.properties
index fec6de5..e648a2a 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/coderegion/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/coderegion/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CodeRegionResultsSnapshot_CodeFragmentMsg=\u30b3\u30fc\u30c9\u30fb\u30d5\u30e9\u30b0\u30e1\u30f3\u30c8: {0}
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/cpu/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/cpu/Bundle_ja.properties
index 167c797..e471148 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/cpu/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/cpu/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AllThreadsMergedCPUCCTContainer_AllThreadsString=\u3059\u3079\u3066\u306e\u30b9\u30ec\u30c3\u30c9
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/locks/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/locks/Bundle_ja.properties
index 5b8f38a..e163f5d 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/locks/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/locks/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ThreadLockCCTNode_WaitMonitors=\u30d6\u30ed\u30c3\u30af\u8005
 ThreadLockCCTNode_WaitMonitorsOwner=\u4fdd\u7559\u8005{0}
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/memory/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/memory/Bundle_ja.properties
index b3b4337..25d02f6 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/memory/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/results/memory/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SampledMemoryResultsSnapshot_MemorySamledMsg=\u30e1\u30e2\u30ea\u30fc(\u30b5\u30f3\u30d7\u30ea\u30f3\u30b0): {0}
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/utils/Bundle_ja.properties
index af7c0f0..0e3786f 100755
--- a/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/org-netbeans-lib-profiler/org-netbeans-lib-profiler/org/netbeans/lib/profiler/utils/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MiscUtils_NotDirectoryMsg=\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u304c\u3001\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 MiscUtils_NotFileMsg=\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u304c\u3001\u901a\u5e38\u306e\u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-api/profiler-api/org/netbeans/modules/profiler/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-api/profiler-api/org/netbeans/modules/profiler/api/Bundle_ja.properties
index 0e2393a..b6768b5 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-api/profiler-api/org/netbeans/modules/profiler/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-api/profiler-api/org/netbeans/modules/profiler/api/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NoSourceFoundMessage=\u30af\u30e9\u30b9{0}\u306e\u30bd\u30fc\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
 OpenFileFailsMessage=\u30d5\u30a1\u30a4\u30eb"{0}"\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3001\u30aa\u30d5\u30bb\u30c3\u30c8"{1}"\u304c\u7bc4\u56f2\u5916\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-api/profiler-api/org/netbeans/modules/profiler/spi/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-api/profiler-api/org/netbeans/modules/profiler/spi/project/Bundle_ja.properties
index a1147f2..02fb3ae 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-api/profiler-api/org/netbeans/modules/profiler/spi/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-api/profiler-api/org/netbeans/modules/profiler/spi/project/Bundle_ja.properties
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ProfilingSettingsSupportProvider_ProfileProjectClassesString=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30af\u30e9\u30b9\u3060\u3051\u3092\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb
 ProfilingSettingsSupportProvider_ProfileProjectSubprojectClassesString=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3068\u30b5\u30d6\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30af\u30e9\u30b9\u3092\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/Bundle_ja.properties
index 24a82bd..5922ddc 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(\u30a2\u30bf\u30c3\u30c1\u30fb\u30b5\u30dd\u30fc\u30c8)
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/dialog/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/dialog/Bundle_ja.properties
index 3c1e479..6e12a01 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/dialog/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/dialog/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AttachDialog_BtnClose=\u9589\u3058\u308b
 AttachDialog_Caption=\u30a2\u30bf\u30c3\u30c1\u8a2d\u5b9a
 AttachDialog_ColumnName=\u540d\u524d
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/providers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/providers/Bundle_ja.properties
index c6b1d5a..3e03c43 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/providers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/providers/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 RemotePackExporter_GeneratingRemotePack=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d1\u30c3\u30af\u3092{0}\u306b\u751f\u6210\u3057\u3066\u3044\u307e\u3059...
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/steps/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/steps/Bundle_ja.properties
index d929438..07ec634 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/steps/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-attach/profiler-attach/org/netbeans/modules/profiler/attach/steps/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AttachDialog_CopiedToClipboard=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u30fb\u30d1\u30e9\u30e1\u30fc\u30bf\u304c\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u30b3\u30d4\u30fc\u3055\u308c\u307e\u3057\u305f
 AttachDialog_RemotePackDialogCaption=\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306e\u9078\u629e
 AttachDialog_RemotePackSaved=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30fb\u30d1\u30c3\u30af\u304c{0}\u306b\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-freeform/profiler-freeform/org/netbeans/modules/profiler/freeform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-freeform/profiler-freeform/org/netbeans/modules/profiler/freeform/Bundle_ja.properties
index 8295a9b..28b8baa 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-freeform/profiler-freeform/org/netbeans/modules/profiler/freeform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-freeform/profiler-freeform/org/netbeans/modules/profiler/freeform/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 ## Resource bundle for package org.netbeans.modules.profiler.
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/Bundle_ja.properties
index 99d89e4..dfc9d44 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AnalysisController_CannotResolveClassMsg=\u30af\u30e9\u30b9{0}\u3092\u89e3\u91c8\u51e6\u7406\u3067\u304d\u307e\u305b\u3093
 AnalysisController_CannotResolveInstanceMsg=\u30af\u30e9\u30b9{1}\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9#{0}\u3092\u89e3\u91c8\u51e6\u7406\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/basic/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/basic/Bundle_ja.properties
index f110bd5..3ce5f1d 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/basic/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/basic/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ArrayDetailsProvider_ItemsNumberString={0}\u9805\u76ee
 ArrayDetailsProvider_OneItemString=1\u9805\u76ee
 ArrayValueView_All=\u3059\u3079\u3066\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/jdk/image/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/jdk/image/Bundle_ja.properties
index b6324b1..905591a 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/jdk/image/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/jdk/image/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ImageDetailProvider_Action_Export=\u30a4\u30e1\u30fc\u30b8\u30fb\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
 ImageDetailProvider_Action_Show=\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u958b\u304f
 ImageDetailProvider_Dimension=\u5bf8\u6cd5: {0}x{1}
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Bundle_ja.properties
index 4957c44..6e2941c 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ComponentDetailsProvider_NewWindow=\u65b0\u898f\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u5206\u6790
 FontView_Preview=ABCabc123
 Utils_NoDetails=<\u8a73\u7d30\u306a\u3057>
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/spi/Bundle_ja.properties
index 8a99642..9510d1e 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/details/spi/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BrowserUtils_Loading=\u5185\u5bb9\u306e\u30ed\u30fc\u30c9\u4e2d...
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/memorylint/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/memorylint/Bundle_ja.properties
index a1d6a2a..d040673 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/memorylint/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/memorylint/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FMT_DistEntry={0}\u500b\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8({1}B):\n
 FMT_HistogramSum=\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5408\u8a08\u6570: {0}\u3001\u30b5\u30a4\u30ba: {1}<br>
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/memorylint/rules/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/memorylint/rules/Bundle_ja.properties
index 95f9b31..29f9f21 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/memorylint/rules/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/memorylint/rules/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FMT_CHM_Record={0}: {1} {2,number}\u306e\u30a8\u30f3\u30c8\u30ea\u306f{3,choice,1#'<b>one bucket</b>'|2#{3,number,integer} buckets}\u306b\u5272\u5f53\u3066\u3089\u308c\u307e\u3059
 LBL_CHM_Desc=\u30cf\u30c3\u30b7\u30e5\u30fb\u30b3\u30fc\u30c9\u306e\u914d\u7f6e\u304c\u9069\u5207\u3067\u306a\u3044\u30a8\u30f3\u30c8\u30ea\u304c\u633f\u5165\u3055\u308c\u3066\u3044\u308bHashMap
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/model/Bundle_ja.properties
index 532e2d1..b06d4b8 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/model/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 BrowserUtils_OutOfMemoryMsg=<html><b>HeapWalker\u5185\u306e\u30e1\u30e2\u30ea\u30fc\u4e0d\u8db3</b><br><br>\u3053\u306e\u30a8\u30e9\u30fc\u3092\u9632\u6b62\u3059\u308b\u306b\u306f\u3001NetBeans IDE\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u3042\u308b<br>etc/netbeans.conf\u30d5\u30a1\u30a4\u30eb\u3067 -Xmx\u306e\u5024\u3092\u5927\u304d\u304f\u3057\u307e\u3059\u3002</html>
 BrowserUtils_PathCopiedToClipboard=\u30eb\u30fc\u30c8\u306e\u30d1\u30b9\u304c\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u30b3\u30d4\u30fc\u3055\u308c\u307e\u3057\u305f\u3002
 BrowserUtils_TruncatedMsg=...<\u5207\u6368\u3066>...
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/ui/Bundle_ja.properties
index ab32219..d1301e8 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalk/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AnalysisControllerUI_AnalysisResultsText=\u5206\u6790\u7d50\u679c:
 AnalysisControllerUI_CancelButtonText=\u53d6\u6d88
 AnalysisControllerUI_ControllerDescr=MemoryLint\u30c4\u30fc\u30eb\u3092\u4f7f\u7528\u3057\u305f\u30c0\u30f3\u30d7\u306e\u81ea\u52d5\u5206\u6790
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalker/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalker/Bundle_ja.properties
index d11beaa..ac4d4e0 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalker/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-heapwalker/profiler-heapwalker/org/netbeans/modules/profiler/heapwalker/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(\u30d2\u30fc\u30d7\u30a6\u30a9\u30fc\u30ab)
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-j2se/profiler-j2se/org/netbeans/modules/profiler/j2se/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-j2se/profiler-j2se/org/netbeans/modules/profiler/j2se/Bundle_ja.properties
index 7b32a4a..da3325c 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-j2se/profiler-j2se/org/netbeans/modules/profiler/j2se/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-j2se/profiler-j2se/org/netbeans/modules/profiler/j2se/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NBProfiler/Categories/UI/JavaFX=JavaFX
 NBProfiler/Categories/UI/JavaFX/EventHandlers=\u30a4\u30d9\u30f3\u30c8\u51e6\u7406
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-kit/profiler-kit/org/netbeans/modules/profiler/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-kit/profiler-kit/org/netbeans/modules/profiler/kit/Bundle_ja.properties
index 696acd8..2a4ef87 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-kit/profiler-kit/org/netbeans/modules/profiler/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-kit/profiler-kit/org/netbeans/modules/profiler/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Java SE
 OpenIDE-Module-Long-Description=NetBeans\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u306f\u3001NetBeans IDE\u306bCPU\u3001\u30e1\u30e2\u30ea\u30fc\u3001\u30b9\u30ec\u30c3\u30c9\u306e\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u6a5f\u80fd\u3092\u8ffd\u52a0\u3059\u308b\u3001\u3042\u3089\u3086\u308b\u6a5f\u80fd\u306e\u63c3\u3063\u305fJava\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u3067\u3059\u3002
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/Bundle_ja.properties
index b177351..6afb8d4 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(NetBeans\u30d0\u30a4\u30f3\u30c9)
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/actions/Bundle_ja.properties
index e47e2e4..dc2506b 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FailedDetermineJavaPlatformMsg=Java\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306e\u7279\u5b9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}
 InvalidPlatformProfilerMsg=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u306b\u5b9a\u7fa9\u3055\u308c\u305fJava\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306f\u7121\u52b9\u3067\u3059\u3002\u300c\u30c4\u30fc\u30eb\u300d\u2192\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u2192\u300c\u305d\u306e\u4ed6\u300d\u2192\n\u300c\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u300d\u2192\u300c\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u306eJava\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u300d\u3067\u5225\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\n\u7121\u52b9\u306a\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0: {0}
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/javac/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/javac/Bundle_ja.properties
index 2cd2a1a..9ce5efa 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/javac/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/javac/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 MDRUtils_ClassNotResolvedMessage=\u30af\u30e9\u30b9{0}\u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/project/Bundle_ja.properties
index 1d9a551..2383701 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/project/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 CTL_MainClassWarning_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/providers/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/providers/Bundle_ja.properties
index 5cd18d5..d430644 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/providers/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-nbimpl/profiler-nbimpl/org/netbeans/modules/profiler/nbimpl/providers/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 DESC_NBProfiler=NetBeans\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9
 MSG_CannotShowPrimitive=\u30d7\u30ea\u30df\u30c6\u30a3\u30d6\u578b\u306e\u30bd\u30fc\u30b9\u3092\u8868\u793a\u3067\u304d\u307e\u305b\u3093
 # {0} - full target name Class.Method(Signature)
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-nbmodule/profiler-nbmodule/org/netbeans/modules/profiler/nbmodule/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-nbmodule/profiler-nbmodule/org/netbeans/modules/profiler/nbmodule/Bundle_ja.properties
index 9479ed0..5091478 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-nbmodule/profiler-nbmodule/org/netbeans/modules/profiler/nbmodule/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-nbmodule/profiler-nbmodule/org/netbeans/modules/profiler/nbmodule/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## Resource bundle for package org.netbeans.modules.profiler.
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/Bundle_ja.properties
index 6daf8cc..fbc8a1a 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/Bundle_ja.properties
index 71c8799..bb6bbec 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ProfilerOptionsPanel_ChooseDumpDirCaption=\u30d2\u30fc\u30d7\u30fb\u30c0\u30f3\u30d7\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e
 ProfilerOptionsPanel_CommPortLabelText=\u901a\u4fe1\u30dd\u30fc\u30c8(&P):
 ProfilerOptionsPanel_CpuChckBoxText=CPU(&C)
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/v2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/v2/Bundle_ja.properties
index c87b598..04bc11a 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/v2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/v2/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ProfilerOptionsContainer_Categories=\u30ab\u30c6\u30b4\u30ea(&C):
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/v2/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/v2/impl/Bundle_ja.properties
index c6499d2..6429a7e 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/v2/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-options/profiler-options/org/netbeans/modules/profiler/options/ui/v2/impl/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ColorCustomizer_AddCaption=\u30d5\u30a3\u30eb\u30bf\u306e\u8ffd\u52a0
 ColorCustomizer_Color=\u8272:
 ColorCustomizer_ColorCaption=\u30d5\u30a3\u30eb\u30bf\u8272\u306e\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-oql-language/profiler-oql-language/org/netbeans/modules/profiler/oql/language/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-oql-language/profiler-oql-language/org/netbeans/modules/profiler/oql/language/Bundle_ja.properties
index 74d1a5e..876c47b 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-oql-language/profiler-oql-language/org/netbeans/modules/profiler/oql/language/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-oql-language/profiler-oql-language/org/netbeans/modules/profiler/oql/language/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(OQL\u8a00\u8a9e\u30b5\u30dd\u30fc\u30c8)
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/Bundle_ja.properties
index 0f25b50..7e4881e 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(OQL)
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/engine/api/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/engine/api/impl/Bundle_ja.properties
index 49b6c78..a1949cd 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/engine/api/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/engine/api/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERROR_EMPTY_SELECT=\u554f\u5408\u305b\u69cb\u6587\u30a8\u30e9\u30fc: 'select'\u5f0f\u306f\u7a7a\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
 ERROR_EMPTY_WHERE=\u554f\u5408\u305b\u69cb\u6587\u30a8\u30e9\u30fc: 'where'\u7bc0\u306f\u7a7a\u306e\u5f0f\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/repository/permgen/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/repository/permgen/resources/Bundle_ja.properties
index 1412c53..b865ac8 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/repository/permgen/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/repository/permgen/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BootstrapCount.desc=\u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7\u30fb\u30af\u30e9\u30b9(java.lang.ClassLoader\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u4f7f\u7528\u305b\u305a\u306bJVM\u3067\u30ed\u30fc\u30c9\u3055\u308c\u305fJava\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u30fb\u30af\u30e9\u30b9)\u306e\u6570
 CLHisto.desc=\u30af\u30e9\u30b9\u30fb\u30ed\u30fc\u30c0\u30fc\u3092\u4e00\u89a7\u8868\u793a\u3057\u3001\u5404\u30af\u30e9\u30b9\u30fb\u30ed\u30fc\u30c0\u30fc\u306b\u3088\u3063\u3066\u30ed\u30fc\u30c9\u3055\u308c\u305f\u30af\u30e9\u30b9\u306e\u6570\u3092\u8868\u793a\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/repository/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/repository/resources/Bundle_ja.properties
index 7f58e56..4a8f91d 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/repository/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-oql/profiler-oql/org/netbeans/modules/profiler/oql/repository/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 NBProfiler/Config/OQL/samplesName=\u30b5\u30f3\u30d7\u30eb
 NBProfiler/Config/OQL/samplesDescr=OQL\u554f\u5408\u305b\u306e\u4f8b\u3067\u3059\u3002
 AllFiles.name=java.io.File\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u4e00\u89a7
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-ppoints/profiler-ppoints/org/netbeans/modules/profiler/ppoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-ppoints/profiler-ppoints/org/netbeans/modules/profiler/ppoints/Bundle_ja.properties
index bed81a4..5a33cf9 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-ppoints/profiler-ppoints/org/netbeans/modules/profiler/ppoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-ppoints/profiler-ppoints/org/netbeans/modules/profiler/ppoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LoadGenProfilingPoint_AnnotationEndString={0} (\u7d42\u4e86)
 LoadGenProfilingPoint_AnnotationStartString={0} (\u958b\u59cb)
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-ppoints/profiler-ppoints/org/netbeans/modules/profiler/ppoints/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-ppoints/profiler-ppoints/org/netbeans/modules/profiler/ppoints/ui/Bundle_ja.properties
index 0582e75..b8e6f13 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-ppoints/profiler-ppoints/org/netbeans/modules/profiler/ppoints/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-ppoints/profiler-ppoints/org/netbeans/modules/profiler/ppoints/ui/Bundle_ja.properties
@@ -1,44 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 CustomizeProfilingPointAction_ActionName=\u7de8\u96c6
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-projectsupport/profiler-projectsupport/org/netbeans/modules/profiler/projectsupport/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-projectsupport/profiler-projectsupport/org/netbeans/modules/profiler/projectsupport/Bundle_ja.properties
index 68fa890..3dabaa0 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-projectsupport/profiler-projectsupport/org/netbeans/modules/profiler/projectsupport/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-projectsupport/profiler-projectsupport/org/netbeans/modules/profiler/projectsupport/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8)
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-projectsupport/profiler-projectsupport/org/netbeans/modules/profiler/projectsupport/utilities/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-projectsupport/profiler-projectsupport/org/netbeans/modules/profiler/projectsupport/utilities/Bundle_ja.properties
index 8bde19d..05903ca 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-projectsupport/profiler-projectsupport/org/netbeans/modules/profiler/projectsupport/utilities/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-projectsupport/profiler-projectsupport/org/netbeans/modules/profiler/projectsupport/utilities/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/Bundle_ja.properties
index 4e347a4..f94e370 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u30fb\u30c8\u30ec\u30fc\u30b5)
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/impl/Bundle_ja.properties
index e504bf4..020bec2 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/impl/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACTION_IdeSnapshot_dialog=IDE\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3092\u30ed\u30fc\u30c9\u3059\u308b
 ACTION_IdeSnapshot_filter=IDE\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/impl/timeline/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/impl/timeline/Bundle_ja.properties
index 6c0ea81..3d26483 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/impl/timeline/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-snaptracer/profiler-snaptracer/org/netbeans/modules/profiler/snaptracer/impl/timeline/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ACTION_FixedScale_name=\u500d\u7387\u56fa\u5b9a
 ACTION_ScaleToFit_name=\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u5408\u308f\u305b\u308b
 ACTION_WheelHScrolls_name=\u30de\u30a6\u30b9\u30fb\u30db\u30a4\u30fc\u30eb\u3067\u6c34\u5e73\u65b9\u5411\u306b\u30b9\u30af\u30ed\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler-utilities/profiler-utilities/org/netbeans/modules/profiler/utilities/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler-utilities/profiler-utilities/org/netbeans/modules/profiler/utilities/Bundle_ja.properties
index 83de740..2d7f95e 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler-utilities/profiler-utilities/org/netbeans/modules/profiler/utilities/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler-utilities/profiler-utilities/org/netbeans/modules/profiler/utilities/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Java\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9(\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3)
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle_ja.properties
index 716cb7e..d0e1fa0 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 HeapDumpWatch_OOME_PROTECTION_OPEN_HEAPDUMP=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u4e0b\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u30af\u30e9\u30c3\u30b7\u30e5\u3057\u3001\u30d2\u30fc\u30d7\u30fb\u30c0\u30f3\u30d7\u304c\u751f\u6210\u3055\u308c\u307e\u3057\u305f\u3002\n\u30d2\u30fc\u30d7\u30a6\u30a9\u30fc\u30ab\u3067\u958b\u304d\u307e\u3059\u304b?
 HeapDumpWatch_OOME_PROTECTION_REMOVE_HEAPDUMP=\u751f\u6210\u3055\u308c\u305f\u30d2\u30fc\u30d7\u30fb\u30c0\u30f3\u30d7\u3092\u958b\u304b\u306a\u3044\u3053\u3068\u3092\u9078\u629e\u3057\u307e\u3057\u305f\u3002\n\u30d2\u30fc\u30d7\u30fb\u30c0\u30f3\u30d7\u306f\u591a\u304f\u306e\u30c7\u30a3\u30b9\u30af\u5bb9\u91cf\u3092\u5360\u6709\u3059\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002\n\u524a\u9664\u3057\u307e\u3059\u304b?
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/actions/Bundle_ja.properties
index 132053c..ed5922a 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## Resource bundle for package org.netbeans.modules.profiler.actions
 #Mon May 03 18:59:38 CEST 2004
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/impl/Bundle_ja.properties
index 222e639..8b4f85a 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/impl/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ProfilerDialogs_DontShowAgainMsg=\u4eca\u5f8c\u3053\u306e\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u8868\u793a\u3057\u306a\u3044
 ProfilerDialogs_ShowDetailsButtonText=\u8a73\u7d30\u306e\u8868\u793a
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/ui/Bundle_ja.properties
index be88bc5..4c5248f 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Sample ResourceBundle properties file
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/utils/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/utils/Bundle_ja.properties
index e8d629b..4e464ac 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/utils/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/utils/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #ResourceBundle properties file for package org.netbeans.modules.profiler.utils
 
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/Bundle_ja.properties
index 3993606..896f022 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 HINT_DetachAction=\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u7d42\u4e86(\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3055\u308c\u305f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304b\u3089\u306e\u30c7\u30bf\u30c3\u30c1)
 HINT_StopAction=\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u7d42\u4e86(\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3055\u308c\u305f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u7d42\u4e86)
 LBL_StopAction=\u30d7\u30ed\u30d5\u30a1\u30a4\u30e9\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u7d42\u4e86(&S)
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/features/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/features/Bundle_ja.properties
index 12d43f8..82b7349 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/features/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/features/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LocksFeature_aggregationByMonitors=\u30e2\u30cb\u30bf\u30fc
 LocksFeature_aggregationByThreads=\u30b9\u30ec\u30c3\u30c9
 LocksFeature_application=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3:
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/impl/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/impl/Bundle_ja.properties
index 95dd863..3051c68 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/impl/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/impl/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ClassMethodList_addClass=\u30af\u30e9\u30b9\u306e\u8ffd\u52a0
 ClassMethodList_addMethod=\u30e1\u30bd\u30c3\u30c9\u306e\u8ffd\u52a0
 ClassMethodList_removeClasses=\u9078\u629e\u3057\u305f\u30af\u30e9\u30b9\u306e\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/ui/Bundle_ja.properties
index efb5168..037875f 100755
--- a/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/profiler/profiler/profiler/org/netbeans/modules/profiler/v2/ui/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ProjectSelector_ExternalProcess=\u5916\u90e8\u30d7\u30ed\u30bb\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/ruby/glassfish-jruby/glassfish-jruby/org/netbeans/modules/glassfish/jruby/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/glassfish-jruby/glassfish-jruby/org/netbeans/modules/glassfish/jruby/Bundle_ja.properties
index 4a33ef4..a1c5f26 100755
--- a/netbeans-l10n-zip/src/ja/ruby/glassfish-jruby/glassfish-jruby/org/netbeans/modules/glassfish/jruby/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/glassfish-jruby/glassfish-jruby/org/netbeans/modules/glassfish/jruby/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 OpenIDE-Module-Display-Category=Ruby
diff --git a/netbeans-l10n-zip/src/ja/ruby/glassfish-jruby/glassfish-jruby/org/netbeans/modules/glassfish/jruby/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/glassfish-jruby/glassfish-jruby/org/netbeans/modules/glassfish/jruby/ui/Bundle_ja.properties
index a915cb1..72ab6c4 100755
--- a/netbeans-l10n-zip/src/ja/ruby/glassfish-jruby/glassfish-jruby/org/netbeans/modules/glassfish/jruby/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/glassfish-jruby/glassfish-jruby/org/netbeans/modules/glassfish/jruby/ui/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 
 JRubyServerCustomizer.name=JRuby
diff --git a/netbeans-l10n-zip/src/ja/ruby/jellytools-ruby/jellytools-ruby/org/netbeans/modules/jellytools/ruby/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/jellytools-ruby/jellytools-ruby/org/netbeans/modules/jellytools/ruby/Bundle_ja.properties
index f149568..59e42ea 100755
--- a/netbeans-l10n-zip/src/ja/ruby/jellytools-ruby/jellytools-ruby/org/netbeans/modules/jellytools/ruby/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/jellytools-ruby/jellytools-ruby/org/netbeans/modules/jellytools/ruby/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Jelly \u30c4\u30fc\u30eb Ruby
 
diff --git a/netbeans-l10n-zip/src/ja/ruby/org-jruby-distro/org-jruby-distro/org/jruby/distro/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/org-jruby-distro/org-jruby-distro/org/jruby/distro/Bundle_ja.properties
index 117e7ea..3e64735 100755
--- a/netbeans-l10n-zip/src/ja/ruby/org-jruby-distro/org-jruby-distro/org/jruby/distro/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/org-jruby-distro/org-jruby-distro/org/jruby/distro/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=JRuby \u304a\u3088\u3073 Rails \u306e\u30c7\u30a3\u30b9\u30c8\u30ea\u30d3\u30e5\u30fc\u30b7\u30e7\u30f3
 OpenIDE-Module-Short-Description=JRuby \u304a\u3088\u3073 Ruby on Rails \u306e\u30d0\u30f3\u30c9\u30eb\u7248\u30c7\u30a3\u30b9\u30c8\u30ea\u30d3\u30e5\u30fc\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ruby/org-jruby/org-jruby/org/jruby/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/org-jruby/org-jruby/org/jruby/Bundle_ja.properties
index 24627ee..b394248 100755
--- a/netbeans-l10n-zip/src/ja/ruby/org-jruby/org-jruby/org/jruby/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/org-jruby/org-jruby/org/jruby/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=JRuby \u306e\u5b9f\u88c5
 OpenIDE-Module-Short-Description=\u5b9f\u969b\u306e JRuby \u306e\u5b9f\u88c5
diff --git a/netbeans-l10n-zip/src/ja/ruby/org-kxml2/org-kxml2/org/kxml2/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/org-kxml2/org-kxml2/org/kxml2/Bundle_ja.properties
index d89b4f3..50e6cab 100755
--- a/netbeans-l10n-zip/src/ja/ruby/org-kxml2/org-kxml2/org/kxml2/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/org-kxml2/org-kxml2/org/kxml2/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Name=kxml2 \u7d71\u5408
 OpenIDE-Module-Short-Description=XML Pull Parser \u5b9f\u88c5
diff --git a/netbeans-l10n-zip/src/ja/ruby/org-netbeans-libs-jrubyparser/org-netbeans-libs-jrubyparser/org/netbeans/libs/jrubyparser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/org-netbeans-libs-jrubyparser/org-netbeans-libs-jrubyparser/org/netbeans/libs/jrubyparser/Bundle_ja.properties
index 812c795..ae0087e 100755
--- a/netbeans-l10n-zip/src/ja/ruby/org-netbeans-libs-jrubyparser/org-netbeans-libs-jrubyparser/org/netbeans/libs/jrubyparser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/org-netbeans-libs-jrubyparser/org-netbeans-libs-jrubyparser/org/netbeans/libs/jrubyparser/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JRuby \u30d1\u30fc\u30b5\u30fc
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ruby/org-netbeans-libs-yydebug/org-netbeans-libs-yydebug/org/netbeans/libs/yydebug/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/org-netbeans-libs-yydebug/org-netbeans-libs-yydebug/org/netbeans/libs/yydebug/Bundle_ja.properties
index db06e66..0346cec 100755
--- a/netbeans-l10n-zip/src/ja/ruby/org-netbeans-libs-yydebug/org-netbeans-libs-yydebug/org/netbeans/libs/yydebug/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/org-netbeans-libs-yydebug/org-netbeans-libs-yydebug/org/netbeans/libs/yydebug/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=yydebug
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/ruby/org-rubyforge-debugcommons/org-rubyforge-debugcommons/org/rubyforge/debugcommons/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/org-rubyforge-debugcommons/org-rubyforge-debugcommons/org/rubyforge/debugcommons/Bundle_ja.properties
index 83a8eff..e40b5cd 100755
--- a/netbeans-l10n-zip/src/ja/ruby/org-rubyforge-debugcommons/org-rubyforge-debugcommons/org/rubyforge/debugcommons/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/org-rubyforge-debugcommons/org-rubyforge-debugcommons/org/rubyforge/debugcommons/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Long-Description=\u30e9\u30a4\u30d6\u30e9\u30ea\u306f\u3001debug-commons (Ruby \u30c7\u30d0\u30c3\u30b0\u30d0\u30c3\u30af\u30a8\u30f3\u30c9) \u3068 NetBeans Ruby \u30c7\u30d0\u30c3\u30ac\u30e2\u30b8\u30e5\u30fc\u30eb (\u30d5\u30ed\u30f3\u30c8\u30a8\u30f3\u30c9) \u3068\u306e\u4ef2\u4ecb\u5f79\u3068\u3057\u3066\u6a5f\u80fd\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=debug-commons-java \u7d71\u5408
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-codecoverage/ruby-codecoverage/org/netbeans/modules/ruby/codecoverage/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-codecoverage/ruby-codecoverage/org/netbeans/modules/ruby/codecoverage/Bundle_ja.properties
index e7b12da..0a6d974 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-codecoverage/ruby-codecoverage/org/netbeans/modules/ruby/codecoverage/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-codecoverage/ruby-codecoverage/org/netbeans/modules/ruby/codecoverage/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=Ruby \u30b3\u30fc\u30c9\u30ab\u30d0\u30ec\u30fc\u30b8\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Short-Description=Ruby \u30b3\u30fc\u30c9\u30ab\u30d0\u30ec\u30fc\u30b8\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/Bundle_ja.properties
index 14ac3e3..c3e96fb 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DebuggerAnnotation
 TOOLTIP_BREAKPOINT=\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/breakpoints/Bundle_ja.properties
index b08ec12..05346cc 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # RubyBreakpointNodeActions
 CTL_GoToSource=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/breakpoints/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/breakpoints/ui/Bundle_ja.properties
index 39fb592..5e3f630 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/breakpoints/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/breakpoints/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # BreakpointCustomizer
 BreakpointCustomizer.fileLbl.text=\u30d5\u30a1\u30a4\u30eb(&F):
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/model/Bundle_ja.properties
index 631183d..fef101d 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/model/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # CallStackModel
 CTL_CallstackModel.Column.Name.Desc=\u30b9\u30bf\u30c3\u30af\u30d5\u30ec\u30fc\u30e0\u306e\u540d\u524d
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/resource/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/resource/Bundle_ja.properties
index d449087..5e22202 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/resource/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/resource/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # General module inforamtion
 OpenIDE-Module-Name=Ruby \u30c7\u30d0\u30c3\u30ac
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/ui/Bundle_ja.properties
index 2db2840..fa3efa9 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-debugger/ruby-debugger/org/netbeans/modules/ruby/debugger/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # ConnectPanel
 ConnectPanel.hostLabel.text=\u30db\u30b9\u30c8(&O):
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-extrahints/ruby-extrahints/org/netbeans/modules/ruby/extrahints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-extrahints/ruby-extrahints/org/netbeans/modules/ruby/extrahints/Bundle_ja.properties
index 66e37af..d33f877 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-extrahints/ruby-extrahints/org/netbeans/modules/ruby/extrahints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-extrahints/ruby-extrahints/org/netbeans/modules/ruby/extrahints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=Ruby \u306e\u8ffd\u52a0\u30d2\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-help/ruby-help/org/netbeans/modules/ruby/help/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-help/ruby-help/org/netbeans/modules/ruby/help/Bundle_ja.properties
index 8bcbd48..ffbb02d 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-help/ruby-help/org/netbeans/modules/ruby/help/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-help/ruby-help/org/netbeans/modules/ruby/help/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Netbeans \u7528\u306e Ruby JavaHelp \u30b3\u30f3\u30c6\u30f3\u30c4
 OpenIDE-Module-Display-Category=Ruby
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/Bundle_ja.properties
index 17fa6e2..7033cb2 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=Ruby \u306e\u30d2\u30f3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/infrastructure/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/infrastructure/Bundle_ja.properties
index 2927c3a..86382f3 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/infrastructure/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/infrastructure/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_Hints_DisplayName=\u30d2\u30f3\u30c8
 CTL_Hints_ToolTip=Ruby \u30b3\u30fc\u30c9\u306e\u30d2\u30f3\u30c8\u3068\u8b66\u544a
 
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/introduce/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/introduce/Bundle_ja.properties
index 3ca447d..4041c2c 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/introduce/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-hints/ruby-hints/org/netbeans/modules/ruby/hints/introduce/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # IntroduceHint
 IntroduceHint=\u5909\u6570\u3068\u30e1\u30bd\u30c3\u30c9\u3092\u5c0e\u5165\u3057\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-javaint/ruby-javaint/org/netbeans/modules/ruby/javaint/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-javaint/ruby-javaint/org/netbeans/modules/ruby/javaint/Bundle_ja.properties
index 84f6f75..b401c24 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-javaint/ruby-javaint/org/netbeans/modules/ruby/javaint/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-javaint/ruby-javaint/org/netbeans/modules/ruby/javaint/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=Ruby Java \u7d71\u5408
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-kit/ruby-kit/org/netbeans/modules/ruby/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-kit/ruby-kit/org/netbeans/modules/ruby/kit/Bundle_ja.properties
index 05f0107..7b65e56 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-kit/ruby-kit/org/netbeans/modules/ruby/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-kit/ruby-kit/org/netbeans/modules/ruby/kit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=Ruby \u304a\u3088\u3073 Rails
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/api/ruby/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/api/ruby/platform/Bundle_ja.properties
index 45ffc52..72a9073 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/api/ruby/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/api/ruby/platform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MissingRuby=Ruby \u304c\u3042\u308a\u307e\u305b\u3093
 InvalidRubyPlatform=Ruby \u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0 "{0}" \u304c\u58ca\u308c\u3066\u3044\u307e\u3059\u3002\u300c\u30c4\u30fc\u30eb\u300d>\u300cRuby \u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u300d\u3067\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/Bundle_ja.properties
index 0b5c631..a5d86fc 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Manifest localization
 OpenIDE-Module-Name=Ruby \u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/execution/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/execution/Bundle_ja.properties
index 60cf004..6700dbd 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/execution/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/execution/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #RunStarting=STARTING
 #RunCompleted=RUN COMPLETED
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/gems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/gems/Bundle_ja.properties
index a3f0025..7bdf15b 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/gems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-platform/ruby-platform/org/netbeans/modules/ruby/platform/gems/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AD_Close=\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9589\u3058\u308b
 CTL_Cancel=\u53d6\u6d88\u3057
 CTL_Close=\u9589\u3058\u308b
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle_ja.properties
index 22fa610..1b9b43d 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_IrbAction=Ruby \u30b7\u30a7\u30eb (IRB)(&R)
 CTL_IrbTopComponent=IRB
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/bundler/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/bundler/Bundle_ja.properties
index 66aa0e3..122e787 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/bundler/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/bundler/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2010 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Bundler=Bundler
 UpdateIndices=IDE \u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u66f4\u65b0
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/rake/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/rake/Bundle_ja.properties
index b706eec..ed86ec3 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/rake/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/rake/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # RakeRunnerAction
 RakeRunnerAction.RunDebugRakeTask=Rake \u30bf\u30b9\u30af\u3092\u5b9f\u884c/\u30c7\u30d0\u30c3\u30b0...
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/templates/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/templates/Bundle_ja.properties
index a6d6c39..ec23c85 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/templates/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/templates/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # RubyTargetChooserPanelGUI
 LBL_RubyTargetChooserPanelGUI_Name=\u540d\u524d\u3068\u5834\u6240
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/Bundle_ja.properties
index 982c016..d675d35 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #Actions
 
 LBL_CleanAction_Name=\u751f\u6210\u7269\u3092\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/customizer/Bundle_ja.properties
index dd3dd2f..f47f5f0 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # CustomizerDialog
 
 LBL_Customizer_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc - {0}
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/Bundle_ja.properties
index a1f5ce4..24dee10 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Ruby/main.rb=Ruby \u30d5\u30a1\u30a4\u30eb
 Templates/Ruby/class.rb=Ruby \u30af\u30e9\u30b9
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/desktop_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/desktop_ja.html
index 3f13d70..a5d4297 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/desktop_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/desktop_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/existingProject_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/existingProject_ja.html
index e6d5060..a9eddd8 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/existingProject_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/existingProject_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile_ja.html
index 6eacaa4..257aba0 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rakefile_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/ruby-application_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/ruby-application_ja.html
index 498d44a..a66b414 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/ruby-application_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/ruby-application_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyclass_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyclass_ja.html
index 8134bb8..ad0b877 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyclass_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyclass_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyfile_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyfile_ja.html
index e8e4a18..8a989af 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyfile_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyfile_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubymodule_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubymodule_ja.html
index f902a97..e6d711c 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubymodule_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubymodule_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyspec_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyspec_ja.html
index 8336ee6..ec82ced 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyspec_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubyspec_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytest_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytest_ja.html
index 0fa3006..6585f0b 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytest_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytest_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytestsuite_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytestsuite_ja.html
index 99b6734..7649fb1 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytestsuite_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/resources/rubytestsuite_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_ja.properties
index 5a52f88..eae281e 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-project/ruby-project/org/netbeans/modules/ruby/rubyproject/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #System file system
 
 Templates/Project/Ruby/emptyRuby.xml=Ruby \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/Bundle_ja.properties
index 4fc447c..5825bf3 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Ruby on Rails \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Ruby
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/application_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/application_ja.html
index 4715c74..fe3582a 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/application_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/application_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/classpath/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/classpath/Bundle_ja.properties
index 9ef1108..ba99e96 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/classpath/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/classpath/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2009 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ReindexGems=\u30af\u30ea\u30c3\u30af\u3057\u3066\u4e00\u89a7\u306b\u3042\u308b gem \u306e IDE \u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u307f\u3092\u4f5c\u6210 (\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u518d\u4f5c\u6210)
 ResetGems=\u30af\u30ea\u30c3\u30af\u3057\u3066\u3059\u3079\u3066\u306e gem \u306e IDE \u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u4f5c\u6210 (\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u518d\u4f5c\u6210)
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/plugins/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/plugins/Bundle_ja.properties
index 9df3911..c49b1a8 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/plugins/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/plugins/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AD_Close=\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9589\u3058\u308b
 AddUrl=\u30ea\u30dd\u30b8\u30c8\u30ea URL \u3092\u8ffd\u52a0
 CTL_Cancel=\u53d6\u6d88\u3057
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/Bundle_ja.properties
index f5e6393..c44b1fa 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # 0 - server, 1 - application name, 2 - port
 # LBL_ServerTab={0} ({1} - {2})
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/nodes/Bundle_ja.properties
index 54fa45e..d72f29e 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/server/nodes/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_StopAction=\u505c\u6b62
 # 0 - app name, 1 - port
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/Bundle_ja.properties
index 1869e81..90cd928 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #Actions
 
 LBL_CleanAction_Name=\u751f\u6210\u7269\u3092\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/customizer/Bundle_ja.properties
index 6f6629a..d20df0e 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/customizer/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # CustomizerDialog
 
 LBL_Customizer_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc - {0}
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/Bundle_ja.properties
index ee886a5..1cdb896 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Templates/Ruby/empty.rjs=\u7a7a\u306e RJS \u30c6\u30f3\u30d7\u30ec\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/application_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/application_ja.html
index 593c17f..d890fe5 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/application_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/application_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/existingApplication_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/existingApplication_ja.html
index 2f2add8..49dbac6 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/existingApplication_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/existingApplication_ja.html
@@ -1,43 +1,23 @@
 <!--
-   - 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-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.
-  -->
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/rjs_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/rjs_ja.html
index 30ec9eb..ed7bffe 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/rjs_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/resources/rjs_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_ja.properties
index 24e2c33..5d08ba7 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-railsprojects/ruby-railsprojects/org/netbeans/modules/ruby/railsprojects/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #System file system
 
 Templates/Project/Ruby/railsApp.xml=Ruby on Rails \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-rakeproject/ruby-rakeproject/org/netbeans/modules/ruby/modules/project/rake/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-rakeproject/ruby-rakeproject/org/netbeans/modules/ruby/modules/project/rake/Bundle_ja.properties
index 47cefda..d6431e4 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-rakeproject/ruby-rakeproject/org/netbeans/modules/ruby/modules/project/rake/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-rakeproject/ruby-rakeproject/org/netbeans/modules/ruby/modules/project/rake/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Rake \u30d9\u30fc\u30b9\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Display-Category=Ruby
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/plugins/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/plugins/Bundle_ja.properties
index 3867c28..582d43a 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/plugins/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/plugins/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DSC_ElNotAvail=\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u306e\u5143\u306e\u8981\u7d20\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u524a\u9664\u3055\u308c\u3066\u3044\u308b\u304b\u3001\u5927\u5e45\u306b\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u4f7f\u7528\u72b6\u6cc1\u3092\u53ce\u96c6\u3067\u304d\u307e\u305b\u3093\u3002
 DSC_ElementNotResolved=\u672a\u89e3\u6c7a\u306e\u8981\u7d20\u3092\u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0\u3067\u304d\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/resources/Bundle_ja.properties
index 726ad19..8aa0263 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Ruby \u30ea\u30d5\u30a1\u30af\u30bf\u30ea\u30f3\u30b0
 OpenIDE-Module-Display-Category=Ruby
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/ui/Bundle_ja.properties
index 425807c..62e38f3 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-refactoring/ruby-refactoring/org/netbeans/modules/refactoring/ruby/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_Rename=\u540d\u524d\u3092\u5909\u66f4
 LBL_RenameComments=\u540d\u524d\u5909\u66f4\u3092\u30b3\u30e1\u30f3\u30c8\u306b\u9069\u7528(&C)
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/editor/Bundle_ja.properties
index 2f89336..27c0385 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/editor/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OPTIONS_rhtml=RHTML \u30a8\u30c7\u30a3\u30bf
 
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/loaders/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/loaders/Bundle_ja.properties
index 5150110..cf48fb1 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/loaders/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/loaders/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Rhtml_loader_name=\u57cb\u3081\u8fbc\u307f Ruby (RHTML) \u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/Bundle_ja.properties
index 3fbfd58..a4ee77f 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=\u57cb\u3081\u8fbc\u307f Ruby (RHTML)
 Loaders/application/x-httpd-eruby=RHTML \u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/templatedesc_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/templatedesc_ja.html
index 081bf56..58a86e5 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/templatedesc_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-rhtml/ruby-rhtml/org/netbeans/modules/ruby/rhtml/resources/templatedesc_ja.html
@@ -5,45 +5,24 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 </head>
 <body>
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/Bundle_ja.properties
index 54d919e..d2f753f 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_CreateProjectStep=\u540d\u524d\u3068\u5834\u6240
 
 DepotPanelVisual.project.name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d(&N):
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/DepotDescription_ja.html b/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/DepotDescription_ja.html
index a050e49..592fc58 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/DepotDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/DepotDescription_ja.html
@@ -1,3 +1,24 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
 <html>
     <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/resources/Bundle_ja.properties
index 9a22397..8f1bedf 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-samples-depot/ruby-samples-depot/org/netbeans/modules/ruby/samples/depot/resources/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Long-Description=Depot \u30b5\u30f3\u30d7\u30eb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3002
 OpenIDE-Module-Name=Depot \u30b5\u30f3\u30d7\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/Bundle_ja.properties
index 0be7910..9d94dbe 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Name=Ruby \u30c6\u30b9\u30c8\u30e9\u30f3\u30ca\u30fc
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Short-Description=Ruby \u30c6\u30b9\u30c8\u30e9\u30f3\u30ca\u30fc
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/ui/Bundle_ja.properties
index daa4a2e..4ac73b3 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby-testrunner/ruby-testrunner/org/netbeans/modules/ruby/testrunner/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 2006-2008 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 TITLE_TEST_RESULTS=Ruby \u30c6\u30b9\u30c8\u7d50\u679c
 ResultWindowOpenAction.MenuName=Ruby \u30c6\u30b9\u30c8\u7d50\u679c(&T)
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ja.properties
index 07085a8..40bd561 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OpenIDE-Module-Display-Category=Ruby
 OpenIDE-Module-Name=Ruby \u7de8\u96c6
 Services/MIMEResolver/ruby-mime-resolver.xml=Ruby \u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/options/Bundle_ja.properties
index 8ee0615..ef8307f 100755
--- a/netbeans-l10n-zip/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/ruby/ruby/org/netbeans/modules/ruby/options/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_Formating_DisplayName=\u6574\u5f62
 CTL_Formating_ToolTip=Ruby \u30b3\u30fc\u30c9\u6574\u5f62\u30aa\u30d7\u30b7\u30e7\u30f3
diff --git a/netbeans-l10n-zip/src/ja/ruby/spellchecker-bindings-ruby/spellchecker-bindings-ruby/org/netbeans/modules/spellchecker/bindings/ruby/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/ruby/spellchecker-bindings-ruby/spellchecker-bindings-ruby/org/netbeans/modules/spellchecker/bindings/ruby/Bundle_ja.properties
index 9dc7bea..33f251c 100755
--- a/netbeans-l10n-zip/src/ja/ruby/spellchecker-bindings-ruby/spellchecker-bindings-ruby/org/netbeans/modules/spellchecker/bindings/ruby/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/ruby/spellchecker-bindings-ruby/spellchecker-bindings-ruby/org/netbeans/modules/spellchecker/bindings/ruby/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #
 OpenIDE-Module-Name=\u30b9\u30da\u30eb\u30c1\u30a7\u30c3\u30ab\u30fc Ruby \u8a00\u8a9e\u30d0\u30a4\u30f3\u30c9
 OpenIDE-Module-Short-Description=\u30b9\u30da\u30eb\u30c1\u30a7\u30c3\u30ab\u30fc Ruby \u8a00\u8a9e\u30d0\u30a4\u30f3\u30c9
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms-android/cordova-platforms-android/org/netbeans/modules/cordova/platforms/android/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms-android/cordova-platforms-android/org/netbeans/modules/cordova/platforms/android/Bundle_ja.properties
index f231893..a39a68f 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms-android/cordova-platforms-android/org/netbeans/modules/cordova/platforms/android/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms-android/cordova-platforms-android/org/netbeans/modules/cordova/platforms/android/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 build-ios=iOS\u3092\u30d3\u30eb\u30c9
 build-android=Android\u3092\u30d3\u30eb\u30c9
 ERR_AdbNotFound=ADB\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002Android SDK\u304c\u6b63\u3057\u304f\n\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\nAndroid SDK\u30de\u30cd\u30fc\u30b8\u30e3\u304c\u958b\u3044\u3066\u3044\u308b\u5834\u5408\u306f\u9589\u3058\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms-ios/cordova-platforms-ios/org/netbeans/modules/cordova/platforms/ios/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms-ios/cordova-platforms-ios/org/netbeans/modules/cordova/platforms/ios/Bundle_ja.properties
index 101377e..130df0e 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms-ios/cordova-platforms-ios/org/netbeans/modules/cordova/platforms/ios/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms-ios/cordova-platforms-ios/org/netbeans/modules/cordova/platforms/ios/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ERR_NO_Xcode=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30d0\u30fc\u30b8\u30e7\u30f3\u306eXcode\u304a\u3088\u3073Xcode\u306e\u30b3\u30de\u30f3\u30c9\u884c\u30c4\u30fc\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\n\u6700\u65b0\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306eXcode\u304a\u3088\u3073iOS SDK\u304cMac App Store\u304b\u3089\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 ERR_NotMac=iOS\u958b\u767a\u306fMac OS X\u3067\u306e\u307f\u53ef\u80fd\u3067\u3059
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms/cordova-platforms/org/netbeans/modules/cordova/platforms/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms/cordova-platforms/org/netbeans/modules/cordova/platforms/Bundle_ja.properties
index c2bcaf7..019d80d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms/cordova-platforms/org/netbeans/modules/cordova/platforms/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms/cordova-platforms/org/netbeans/modules/cordova/platforms/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=HTML5
 OpenIDE-Module-Long-Description=Cordova\u306e\u30e2\u30d0\u30a4\u30eb\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Name=\u30e2\u30d0\u30a4\u30eb\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms/cordova-platforms/org/netbeans/modules/cordova/platforms/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms/cordova-platforms/org/netbeans/modules/cordova/platforms/api/Bundle_ja.properties
index 4168a53..4ce823e 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms/cordova-platforms/org/netbeans/modules/cordova/platforms/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova-platforms/cordova-platforms/org/netbeans/modules/cordova/platforms/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_ConnectingIOSDevice=iOS\u30c7\u30d0\u30a4\u30b9\u306b\u63a5\u7d9a\u4e2d...
 LBL_ConnectionAndroidDevice=Android\u30c7\u30d0\u30a4\u30b9\u306b\u63a5\u7d9a\u4e2d...
 LBL_ConnectionAndroidEmulator=Android\u30a8\u30df\u30e5\u30ec\u30fc\u30bf\u306b\u63a5\u7d9a\u4e2d...
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/Bundle_ja.properties
index b81de90..c25a0ac 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 build-ios=iOS\u3092\u30d3\u30eb\u30c9
 build-android=Android\u3092\u30d3\u30eb\u30c9
 CTL_InstallAndRun=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u5b9f\u884c
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/options/Bundle_ja.properties
index bf46b8e..e752680 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/options/Bundle_ja.properties
@@ -1,45 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AdvancedOption_DisplayName_MobilePlatforms=\u30e2\u30d0\u30a4\u30eb\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0
 AdvancedOption_Keywords_MobilePlatforms=\u30e2\u30d0\u30a4\u30eb\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0iOS Android PhoneGap Cordova iPhone iPad
 ERR_NoAndroid=Android SDK\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 LBL_AndroidPath=Android SDK\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e
 LBL_PleaseWait=\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 MobilePlatformsPanel.androidPanel.TabConstraints.tabTitle=Android
 MobilePlatformsPanel.cordovaPanel.TabConstraints.tabTitle=Cordova
 MobilePlatformsPanel.androidSdkLabel.text=Android SDK\u306e\u5834\u6240(&A):
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/project/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/project/Bundle_ja.properties
index 21de489..503cf9e 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/project/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/project/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 #Do not translate
 CordovaPanel.iosTarget.text=iOS\u30bf\u30fc\u30b2\u30c3\u30c8:
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/resources/CordovaProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/resources/CordovaProjectDescription_ja.html
index ad93029..8a3e71a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/resources/CordovaProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/resources/CordovaProjectDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/resources/CordovaSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/resources/CordovaSampleDescription_ja.html
index 3d5d4db..b6c66c6 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/resources/CordovaSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/resources/CordovaSampleDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/wizard/Bundle_ja.properties
index 5e1f5ae..72f949a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/cordova/cordova/org/netbeans/modules/cordova/wizard/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ClientSideProjectWizardIterator.existingCordovaProject.displayName=\u65e2\u5b58\u306e\u30bd\u30fc\u30b9\u3092\u4f7f\u7528\u3059\u308bCordova\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
 ERR_InvalidAppId={0}\u306f\u6709\u52b9\u306a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3ID\u3067\u306f\u3042\u308a\u307e\u305b\u3093
 ERR_MobilePlatforms=\u30e2\u30d0\u30a4\u30eb\u30fb\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306f\u69cb\u6210\u3055\u308c\u3066\u3044\u307e\u305b\u3093
@@ -10,45 +27,6 @@
 LBL_iPhoneSimulator=iPhone\u30b7\u30df\u30e5\u30ec\u30fc\u30bf
 
 LBL_NameNLocation=\u540d\u524d\u3068\u5834\u6240
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2012 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
 Templates/Project/Samples/HTML5/CordovaMapsSample=Cordova\u30de\u30c3\u30d7\u30fb\u30b5\u30f3\u30d7\u30eb
 
 LBL_ProjectLocation=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5834\u6240(&L):
diff --git a/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/chrome/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/chrome/Bundle_ja.properties
index 089ccb3..c43d5dd 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/chrome/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/chrome/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ChromeBrowser.name=Chrome
 ChromeBrowserWithPlugin.name=Chrome
 ChromiumBrowser.name=Chromium
 ChromiumBrowserWithPlugin.name=Chromium
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=\u5916\u90e8Chrome\u30d6\u30e9\u30a6\u30b6
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/plugins/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/plugins/Bundle_ja.properties
index 7a610e3..6906b28 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/plugins/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/plugins/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DebuggerEnableFailed=\u30d6\u30e9\u30a6\u30b6\u306b\u3088\u3063\u3066\u3053\u306e\u30bf\u30d6\u306e\u30c7\u30d0\u30c3\u30b0\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f\u3002\nChrome\u958b\u767a\u8005\u30c4\u30fc\u30eb(\u307e\u305f\u306f\u4ed6\u306e\u4efb\u610f\u306e\u30d6\u30e9\u30a6\u30b6\u30fb\u30c7\u30d0\u30c3\u30ac)\u3092\u9589\u3058\u3001\u518d\u8a66\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 # {0} - port
 ServerStartFailed=\u5185\u90e8WebSocket\u30b5\u30fc\u30d0\u30fc\u304c\u8d77\u52d5\u306b\u5931\u6557\u3057\u3001\u5916\u90e8\u306eChrome\u30d6\u30e9\u30a6\u30b6\u3068\u306e\u901a\u4fe1\u304c\u6a5f\u80fd\u3057\u307e\u305b\u3093\u3002\u8a73\u7d30\u306f\u3001IDE\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u308c\u306f\u3001\u8907\u6570\u306eNetBeans\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u304c\u540c\u6642\u306b\u5b9f\u884c\u3055\u308c\u3066\u3044\u308b\u3001\u307e\u305f\u306f\u305d\u306e\u4ed6\u306e\u4e00\u90e8\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u30dd\u30fc\u30c8{0}\u3092\u3057\u3066\u3044\u308b\u5834\u5408\u306b\u767a\u751f\u3059\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/plugins/chrome/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/plugins/chrome/Bundle_ja.properties
index 467db03..47a2e31 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/plugins/chrome/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/extbrowser-chrome/extbrowser-chrome/org/netbeans/modules/extbrowser/plugins/chrome/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_ChromePluginIsDisabled=NetBeans Chrome\u62e1\u5f35\u6a5f\u80fd\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u307e\u3059\u304c\u7121\u52b9\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002Chrome\u306e\u62e1\u5f35\u6a5f\u80fd\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u306b\u79fb\u52d5\u3057\u3066\u624b\u52d5\u3067\u6709\u52b9\u306b\u3057\u3001\u300cOK\u300d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u7d9a\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/Bundle_ja.properties
index 5a9764a..befb45c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 doc.building=AngularJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 # {0} - the documentation URL
 doc.cannotGet="{0}"\u304b\u3089AngularJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Long-Description=AngularJS\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u7de8\u96c6\u4e2d
 OpenIDE-Module-Name=AngularJS\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/model/Bundle_ja.properties
index 7607cf9..f69c386 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/model/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_Angular=AngularJS
 LBL_DocumentationDownload=AngularJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/resources/Bundle_ja.properties
index 72805f7..b2c4fe5 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-angular/html-angular/org/netbeans/modules/html/angular/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 mod-constructor=HTML\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u30fb\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-knockout/html-knockout/org/netbeans/modules/html/knockout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/html-knockout/html-knockout/org/netbeans/modules/html/knockout/Bundle_ja.properties
index a404571..5ba1d61 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-knockout/html-knockout/org/netbeans/modules/html/knockout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-knockout/html-knockout/org/netbeans/modules/html/knockout/Bundle_ja.properties
@@ -1,44 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 cannot_load_help=\u30d8\u30eb\u30d7\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002
 doc.building=Knockout\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 # {0} - the documentation URL
 doc.cannotGet="{0}"\u304b\u3089Knockout\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=\u7de8\u96c6
 OpenIDE-Module-Long-Description=Knockout HTML\u30a8\u30c7\u30a3\u30bf\u306e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Name=Knockout HTML\u30a8\u30c7\u30a3\u30bf
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/Bundle_ja.properties
index ab1d522..df5ffb5 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=Oracle JET\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Name=Oracle JET\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/data/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/data/Bundle_ja.properties
index 8fcb004..beecc3c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/data/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/data/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 label_ojet=OJET
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/Bundle_ja.properties
index 68f580a..72fdcea 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OJETFrameworkCustomizer.displayName=Oracle JET
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2015, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OJETPanel.lVersion.text=Oracle JET\u30d0\u30fc\u30b8\u30e7\u30f3:
 OJETPanel.name=Oracle JET
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/Bundle_ja.properties
index 15d6a57..2d92d44 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Layer display names
 text/javascript/ojet=JavaScript Oracle JET
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/EmptyJETModuleDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/EmptyJETModuleDescription_ja.html
index 8649572..741333a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/EmptyJETModuleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/EmptyJETModuleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2016 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/KnockoutJETModuleDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/KnockoutJETModuleDescription_ja.html
index df8e8a9..cc1ad10 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/KnockoutJETModuleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/KnockoutJETModuleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2016 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewComponentInteractionSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewComponentInteractionSampleDescription_ja.html
index bdbae6b..0894152 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewComponentInteractionSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewComponentInteractionSampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewOracleJETBaseDistributionDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewOracleJETBaseDistributionDescription_ja.html
index 428fb8f..63671b4 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewOracleJETBaseDistributionDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewOracleJETBaseDistributionDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2016 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewOracleJETQuickStartBasicDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewOracleJETQuickStartBasicDescription_ja.html
index d87ba20..7ab8c44 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewOracleJETQuickStartBasicDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/resources/NewOracleJETQuickStartBasicDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/wizard/Bundle_ja.properties
index a642538..6c3d02f 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/html-ojet/html-ojet/org/netbeans/modules/html/ojet/ui/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NewJetModuleWizardPanel.error.htmlFile=HTML\u30d5\u30a1\u30a4\u30eb\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\u3002
 NewJetModuleWizardPanel.error.htmlFolder=HTML\u30d5\u30a9\u30eb\u30c0\u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/exec/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/exec/Bundle_ja.properties
index e0aa04d..8830d5b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/exec/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/exec/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 BowerExecutable.install=Bower ({0})
 # {0} - project name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/options/Bundle_ja.properties
index b44c477..cb11556 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/options/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BowerOptionsValidator.bower.name=Bower
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/problems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/problems/Bundle_ja.properties
index 35d53a3..c35db3d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/problems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/problems/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 BowerProblemsProvider.dependencies.none.description=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306fBower\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u4f7f\u7528\u3057\u307e\u3059\u304c\u3001\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 BowerProblemsProvider.dependencies.none.title=Bower\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u3042\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/resources/Bundle_ja.properties
index fee4b3e..0e6f8d5 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=Bower\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/Bundle_ja.properties
index fef2694..639005a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - library name
 # {1} - library version
 # {2} - library type
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/actions/Bundle_ja.properties
index dc83fe7..e09b8c6 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/actions/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BowerInstallAction.name=Bower\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/libraries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/libraries/Bundle_ja.properties
index 25f5fd3..5949003 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/libraries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/libraries/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DependenciesPanel.addAndKeep=\u8ffd\u52a0\u3057\u3066\u65e2\u5b58\u3092\u4fdd\u6301
 DependenciesPanel.addAndRemove=\u8ffd\u52a0\u3057\u3066\u65e2\u5b58\u3092\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/options/Bundle_ja.properties
index 6e3629a..0da71d4 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BowerOptionsPanel.bower.browse.title=Bower\u306e\u9078\u629e
 # {0} - bower file name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/resources/BowerJsonDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/resources/BowerJsonDescription_ja.html
index 6130124..b5cc146 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/resources/BowerJsonDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/resources/BowerJsonDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/resources/BowerrcDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/resources/BowerrcDescription_ja.html
index 023a911..f1fadb9 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/resources/BowerrcDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/resources/BowerrcDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/wizard/Bundle_ja.properties
index 7cda467..f120928 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/ui/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates.bower.json=bower.json
 Templates.bowerrc=.bowerrc
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/util/Bundle_ja.properties
index aaddeee..4ef2b4d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-bower/javascript-bower/org/netbeans/modules/javascript/bower/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
 # when bower install action is called
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/Bundle_ja.properties
index 3abe89e..831bab2 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LibraryCustomizer.creatingLibraryFolder=JavaScript\u30e9\u30a4\u30d6\u30e9\u30ea\u7528\u306b\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3057\u3066\u3044\u307e\u3059\u3002
 # {0} - library name
 # {1} - file name/path
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/resources/Bundle_ja.properties
index fd84b6a..6a9c786 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=CDNJS\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/ui/Bundle_ja.properties
index fedb364..7c92cb1 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FileNode.installProperty.displayName=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
 FileSelectionPanel.fileColumn.title=\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/ui/logicalview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/ui/logicalview/Bundle_ja.properties
index f7b786c..00a1c3c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/ui/logicalview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-cdnjs/javascript-cdnjs/org/netbeans/modules/javascript/cdnjs/ui/logicalview/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CdnjsLibrariesNode.name=CDNJS\u30e9\u30a4\u30d6\u30e9\u30ea
 # {0} - library name
 # {1} - library version
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/Bundle_ja.properties
index e0f98e9..7618bb9 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 GruntBuildTool.configure=Grunt\u30bf\u30b9\u30af\u3092\u547c\u3073\u51fa\u3059\u3088\u3046\u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u69cb\u6210\u3057\u307e\u3059\u304b\u3002
 GruntBuildTool.name=Grunt
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/exec/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/exec/Bundle_ja.properties
index d9f73de..538d584 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/exec/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/exec/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 GruntExecutable.run=Grunt ({0})
 TaskList.error=Grunt\u30bf\u30b9\u30af\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/options/Bundle_ja.properties
index 96177ab..d9a86f4 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/options/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 GruntOptionsValidator.grunt.name=Grunt
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/resources/Bundle_ja.properties
index 30b4e69..68f81b2 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=Grunt\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/actions/Bundle_ja.properties
index 6c544a9..6c26205 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 RunGruntTaskAction.name=Grunt\u30bf\u30b9\u30af
 TasksMenuSupportImpl.grunt.configure=Grunt\u306e\u69cb\u6210...
 TasksMenuSupportImpl.tasks.label=\u30bf\u30b9\u30af(&T)
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/customizer/Bundle_ja.properties
index 5b35ffe..b709b68 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CustomizerSupportImpl.header=IDE\u30a2\u30af\u30b7\u30e7\u30f3\u3092Grunt\u30bf\u30b9\u30af\u306b\u5272\u308a\u5f53\u3066\u307e\u3059\u3002
 GruntCustomizerPanel.tasksLabel.text=\u30bf\u30b9\u30af\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea(&T):
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/navigator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/navigator/Bundle_ja.properties
index a5da456..15dbbf0 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/navigator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/navigator/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NavigatorPanelSupportImpl.hint=\u73fe\u5728\u306eGruntfile.js\u30b9\u30af\u30ea\u30d7\u30c8\u3067\u30bf\u30b9\u30af\u3092\u8868\u793a\u3057\u307e\u3059\u3002
 NavigatorPanelSupportImpl.name=Grunt\u30bf\u30b9\u30af
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/options/Bundle_ja.properties
index 6bd3af2..1fa7e77 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GruntOptionsPanel.grunt.browse.title=Grunt\u306e\u9078\u629e
 # {0} - grunt file name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/resources/GruntfileDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/resources/GruntfileDescription_ja.html
index 841e992..f64ef76 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/resources/GruntfileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/resources/GruntfileDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/wizard/Bundle_ja.properties
index 7e3fbb1..ec34da6 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/ui/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates.gruntfile.js=Gruntfile.js
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/util/Bundle_ja.properties
index fee1453..c93a053 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-grunt/javascript-grunt/org/netbeans/modules/javascript/grunt/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
 # when run grunt task action is called
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/Bundle_ja.properties
index 6baf728..3cd1b36 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 GulpBuildTool.configure=Gulp\u30bf\u30b9\u30af\u3092\u547c\u3073\u51fa\u3059\u3088\u3046\u306b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u69cb\u6210\u3057\u307e\u3059\u304b\u3002
 GulpBuildTool.name=Gulp
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/exec/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/exec/Bundle_ja.properties
index b7d2911..916e556 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/exec/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/exec/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 GulpExecutable.run=Gulp ({0})
 TaskList.error=Gulp\u30bf\u30b9\u30af\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/options/Bundle_ja.properties
index d02c215..a4342cb 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/options/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 GulpOptionsValidator.gulp.name=Gulp
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/resources/Bundle_ja.properties
index e946850..baa9755 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=Gulp\u306e\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/actions/Bundle_ja.properties
index bc38ee7..0438742 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 RunGulpTaskAction.name=Gulp\u30bf\u30b9\u30af
 TasksMenuSupportImpl.gulp.configure=Gulp\u306e\u69cb\u6210...
 TasksMenuSupportImpl.tasks.label=\u30bf\u30b9\u30af(&T)
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/customizer/Bundle_ja.properties
index bf66875..b912027 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/customizer/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CustomizerSupportImpl.header=IDE\u30a2\u30af\u30b7\u30e7\u30f3\u3092Gulp\u30bf\u30b9\u30af\u306b\u5272\u308a\u5f53\u3066\u307e\u3059\u3002
 GulpCustomizerProvider.name=Gulp
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/navigator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/navigator/Bundle_ja.properties
index 5bcef87..7ecbacf 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/navigator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/navigator/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NavigatorPanelSupportImpl.hint=\u73fe\u5728\u306egulpfile.js\u30b9\u30af\u30ea\u30d7\u30c8\u3067\u30bf\u30b9\u30af\u3092\u8868\u793a\u3057\u307e\u3059\u3002
 NavigatorPanelSupportImpl.name=Gulp\u30bf\u30b9\u30af
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/options/Bundle_ja.properties
index 050283d..2f5f3be 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GulpOptionsPanel.gulp.browse.title=Gulp\u306e\u9078\u629e
 # {0} - gulp file name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/resources/GulpfileDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/resources/GulpfileDescription_ja.html
index ddd4007..6dad61c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/resources/GulpfileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/resources/GulpfileDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/wizard/Bundle_ja.properties
index 917f3c6..64793d7 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/ui/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates.gulpfile.js=gulpfile.js
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/util/Bundle_ja.properties
index 60b1ae9..efcc899 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-gulp/javascript-gulp/org/netbeans/modules/javascript/gulp/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
 # when run gulp task action is called
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/Bundle_ja.properties
index d95c4d2..936f480 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ACTION_RESTART=\u518d\u8d77\u52d5
 JsTestDriverResolver=js-test-driver\u69cb\u6210\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/preferences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/preferences/Bundle_ja.properties
index b46ede5..a611414 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/preferences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/preferences/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JsTestDriverPreferencesValidator.config.name=\u69cb\u6210
 # {0} - source
 JsTestDriverPreferencesValidator.validateFile.missing={0}\u3092\u9078\u629e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/resources/TemplateHelp_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/resources/TemplateHelp_ja.html
index cb3dafb..8144dbc 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/resources/TemplateHelp_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/resources/TemplateHelp_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/ui/customizer/Bundle_ja.properties
index c65c6b5..724589e 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CustomizerJsTestDriver.chooser.config=JS\u30c6\u30b9\u30c8\u30fb\u30c9\u30e9\u30a4\u30d0\u69cb\u6210\u30d5\u30a1\u30a4\u30eb\u306e\u9078\u629e
 CustomizerJsTestDriver.config.none=jsTestDriver.conf\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/ui/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/ui/nodes/Bundle_ja.properties
index f5f0999..110fdec 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/ui/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/ui/nodes/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JumpToCallStackAction.name=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5(&G)
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/wizard/Bundle_ja.properties
index 9638b4f..80b93d0 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-jstestdriver/javascript-jstestdriver/org/netbeans/modules/javascript/jstestdriver/wizard/Bundle_ja.properties
@@ -1,40 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 DownloadFailure=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u8a73\u7d30\u306f\u3001IDE\u30ed\u30b0\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 InstallJasminePanel.jCheckBox1.text=js-test-driver\u7528\u306eJasmine\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u8a2d\u5b9a
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/Bundle_ja.properties
index 076299c..10278b3 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JsTestingProviderImpl.displayName=Karma
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/coverage/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/coverage/Bundle_ja.properties
index e82f46c..ba1fe50 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/coverage/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/coverage/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CoverageProcessor.warn.debugCoverage=\u30ab\u30d0\u30ec\u30fc\u30b8\u306fKarma\u30c7\u30d0\u30c3\u30b0\u30fb\u30e2\u30fc\u30c9\u3067\u81ea\u52d5\u7684\u306b\u7121\u52b9\u306b\u306a\u308a\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/exec/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/exec/Bundle_ja.properties
index 05ddfe4..63e5441 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/exec/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/exec/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 KarmaExecutable.start=Karma ({0})
 KarmaServer.start.error=Karma\u3092\u8d77\u52d5\u3067\u304d\u307e\u305b\u3093(Karma\u306e\u8a2d\u5b9a\u304c\u7121\u52b9?)\u3001\u8a73\u7d30\u306fIDE\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/options/Bundle_ja.properties
index 186a76b..c37f702 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/options/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 KarmaOptionsValidator.karma.name=Karma
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/preferences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/preferences/Bundle_ja.properties
index 47d76be..627445f 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/preferences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/preferences/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 KarmaPreferencesValidator.config.name=\u69cb\u6210
 KarmaPreferencesValidator.debug.browser=\u30c7\u30d0\u30c3\u30b0\u306e\u30d6\u30e9\u30a6\u30b6\u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/resources/Bundle_ja.properties
index 811c155..7faac62 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 OpenIDE-Module-Display-Category=\u30c6\u30b9\u30c8\u30fb\u30c4\u30fc\u30eb
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/run/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/run/Bundle_ja.properties
index 8bb005a..62f8f67 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/run/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/run/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JumpToCallStackAction.name=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5(&G)
 # {0} - browser name
 TestRunner.browser.error=[{0}] ERROR:
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/Bundle_ja.properties
index 0147614..7672d59 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 KarmaErrorsDialog.message=Karma\u8b66\u544a/\u30a8\u30e9\u30fc\u306e\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/actions/Bundle_ja.properties
index 3dd2967..24ced99 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/actions/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 SetKarmaConfAction.name=Karma\u69cb\u6210\u306e\u8a2d\u5b9a
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/customizer/Bundle_ja.properties
index 56ae151..b25217b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CustomizerKarma.chooser.config=Karma\u69cb\u6210\u30d5\u30a1\u30a4\u30eb\u306e\u9078\u629e
 CustomizerKarma.config.none=Karma\u69cb\u6210\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/logicalview/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/logicalview/Bundle_ja.properties
index c01a402..feb3fb8 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/logicalview/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/logicalview/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ActiveKarmaConfigAction.name=\u69cb\u6210\u3092\u8a2d\u5b9a
 CustomizeKarmaAction.name=\u30d7\u30ed\u30d1\u30c6\u30a3
 DebugKarmaServerAction.browser.none=Karma\u30c7\u30d0\u30c3\u30b0\u30fb\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u6700\u521d\u306b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/options/Bundle_ja.properties
index fc42da7..2230a60 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 KarmaOptionsPanel.karma.browse.title=Karma\u306e\u9078\u629e
 # {0} - karma file name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/resources/KarmaConfDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/resources/KarmaConfDescription_ja.html
index 3744a52..3bb9631 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/resources/KarmaConfDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/resources/KarmaConfDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2013 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/wizard/Bundle_ja.properties
index bc9a1dd..e682e8c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/ui/wizard/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NewKarmaConfWizardIterator.karma.template.displayName=Karma\u69cb\u6210\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/util/Bundle_ja.properties
index 8867160..be60ccf 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-karma/javascript-karma/org/netbeans/modules/javascript/karma/util/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 FileUtils.validateFile.file=\u30d5\u30a1\u30a4\u30eb
 # {0} - source
 FileUtils.validateFile.missing={0}\u3092\u9078\u629e\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/exec/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/exec/Bundle_ja.properties
index 2b3a904..f0bf3cf 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/exec/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/exec/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project name
 ExpressExecutable.generate=Express ({0})
 # {0} - reason
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/file/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/file/Bundle_ja.properties
index 927c083..6857447 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/file/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/file/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NodeMimeResolver.displayName=Node.js\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/platform/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/platform/Bundle_ja.properties
index 4610791..dba57fa 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/platform/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/platform/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NodeJsPlatformProvider.name=Node.js
 # {0} - project name
 NodeJsPlatformProvider.sync.done=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d{0}\u306fpackage.json\u306b\u540c\u671f\u3055\u308c\u307e\u3057\u305f\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/preferences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/preferences/Bundle_ja.properties
index 9447754..e8fc3ba 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/preferences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/preferences/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NodeJsPreferencesValidator.debugPort.invalid=\u30c7\u30d0\u30c3\u30b0\u30fb\u30dd\u30fc\u30c8\u306f\u7121\u52b9\u3067\u3059
 NodeJsPreferencesValidator.startFile.name=\u958b\u59cb\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/problems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/problems/Bundle_ja.properties
index dc06717..8a9778d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/problems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/problems/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - message
 NodeJsProblemProvider.error=Node.js: {0}
 NodeJsProblemProvider.node.sources=node.js\u30bd\u30fc\u30b9\u304c\u3042\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/resources/Bundle_ja.properties
index fcc6a4c..767af5a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=Node.js\u306b\u5bfe\u3059\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/Bundle_ja.properties
index 659794e..937f3d1 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2014 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CustomizeLibrariesAction.name=\u30d7\u30ed\u30d1\u30c6\u30a3
 NodeJsPathPanel.download.error=\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f(IDE\u30ed\u30b0\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044)\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/actions/Bundle_ja.properties
index 7bc9c01..10959d9 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NpmInstallAction.name=npm\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
 NpmRunScriptAction.name=npm\u30b9\u30af\u30ea\u30d7\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/customizer/Bundle_ja.properties
index f0e3d80..e3f312d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # customizer
 NodeJsCustomizerPanel.enabledCheckBox.text=Node.js\u30b5\u30dd\u30fc\u30c8\u306e\u6709\u52b9\u5316(&E)
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/libraries/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/libraries/Bundle_ja.properties
index 0291537..cd764df 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/libraries/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/libraries/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 DependenciesPanel.addAndKeep=\u8ffd\u52a0\u3057\u3066\u65e2\u5b58\u3092\u4fdd\u6301
 DependenciesPanel.addAndRemove=\u8ffd\u52a0\u3057\u3066\u65e2\u5b58\u3092\u524a\u9664
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/options/Bundle_ja.properties
index 6da755f..7e5d5b0 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/options/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NodeJsOptionsPanel.express.browse.title=Express\u306e\u9078\u629e
 # {0} - express file name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/ExistingNodeJsProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/ExistingNodeJsProjectDescription_ja.html
index 78d05fd..107b478 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/ExistingNodeJsProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/ExistingNodeJsProjectDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2015 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewHtml5ProjectWithNodeJsDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewHtml5ProjectWithNodeJsDescription_ja.html
index 5a361e3..f5b0645 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewHtml5ProjectWithNodeJsDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewHtml5ProjectWithNodeJsDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewListDirectorySampleDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewListDirectorySampleDescription_ja.html
index af32d4d..84681f6 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewListDirectorySampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewListDirectorySampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesAngularSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesAngularSampleDescription_ja.html
index 63c29d1..4fb3b4a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesAngularSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesAngularSampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesExpressSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesExpressSampleDescription_ja.html
index 5685646..4e785d0 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesExpressSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesExpressSampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesKnockoutSampleDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesKnockoutSampleDescription_ja.html
index 971ea14..dcbd6ba 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesKnockoutSampleDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewMessagesKnockoutSampleDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewNodeJsProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewNodeJsProjectDescription_ja.html
index 0033a11..29d1bc4 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewNodeJsProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/NewNodeJsProjectDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/PackageJsonDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/PackageJsonDescription_ja.html
index d24873e..fba561f 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/PackageJsonDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/resources/PackageJsonDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/wizard/Bundle_ja.properties
index 883741e..dee5c14 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/ui/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - current step index
 # {1} - number of steps
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/util/Bundle_ja.properties
index b129625..a0fc1f1 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-nodejs/javascript-nodejs/org/netbeans/modules/javascript/nodejs/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - version
 FileUtils.sources.downloading.iojs=io.js\u30d0\u30fc\u30b8\u30e7\u30f3{0}\u306e\u30bd\u30fc\u30b9\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059...
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/Bundle_ja.properties
index e5b738d..e5395a7 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-#
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=JavaScript V8\u30c7\u30d0\u30c3\u30acUI
 OpenIDE-Module-Short-Description=V8\u30c7\u30d0\u30c3\u30b0\u30fb\u30d7\u30ed\u30c8\u30b3\u30eb\u3092\u4ecb\u3057\u305fJavaScript\u30c7\u30d0\u30c3\u30ac\u306eUI
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/annotation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/annotation/Bundle_ja.properties
index cf60ce6..026c26c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/annotation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/annotation/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CallStackAnnotationDesc=\u547c\u51fa\u3057\u30b9\u30bf\u30c3\u30af
 CurrentLineAnnotationDesc=\u73fe\u5728\u306e\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/attach/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/attach/Bundle_ja.properties
index 54d3305..e9361fa 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/attach/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/attach/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AttachCustomizer.hostLabel.text=\u30db\u30b9\u30c8(&H):
 AttachCustomizer.portLabel.text=\u30dd\u30fc\u30c8(&P):
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/callstack/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/callstack/models/Bundle_ja.properties
index b467ab9..f8b5f67 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/callstack/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/callstack/models/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_DebuggerRunning=\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5b9f\u884c\u3057\u3066\u3044\u307e\u3059...
 CTL_DebuggerRunningDescr=\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u5b9f\u884c\u4e2d\u30b9\u30bf\u30c3\u30af\u30fb\u30c8\u30ec\u30fc\u30b9\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 CTL_DebuggingActionsModel_Copy2CLBD_Label=\u30b9\u30bf\u30c3\u30af\u3092\u30b3\u30d4\u30fc
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/eval/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/eval/Bundle_ja.properties
index a62832a..1c716af 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/eval/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/eval/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_EvaluatorHistoryNode=\u5c65\u6b74
 CTL_EvaluatorHistoryNodeDescr=\u8a55\u4fa1\u5c65\u6b74
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/resources/Bundle_ja.properties
index 597e6f5..3f23b9d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Menu/RunProject/Stack=\u30b9\u30bf\u30c3\u30af(&S)
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/vars/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/vars/models/Bundle_ja.properties
index 3ee9083..818b4e7 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/vars/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug-ui/javascript-v8debug-ui/org/netbeans/modules/javascript/v8debug/ui/vars/models/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - argument number
 CTL_Argument=\u5f15\u6570{0}
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/Bundle_ja.properties
index 8dc8069..0e91e55 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-#
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - port number
 CTL_V8LocalAttach=\u30dd\u30fc\u30c8{0}\u306eNode.js
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/annotation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/annotation/Bundle_ja.properties
index cf60ce6..026c26c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/annotation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/annotation/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CallStackAnnotationDesc=\u547c\u51fa\u3057\u30b9\u30bf\u30c3\u30af
 CurrentLineAnnotationDesc=\u73fe\u5728\u306e\u884c
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/attach/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/attach/Bundle_ja.properties
index 54d3305..e9361fa 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/attach/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/attach/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AttachCustomizer.hostLabel.text=\u30db\u30b9\u30c8(&H):
 AttachCustomizer.portLabel.text=\u30dd\u30fc\u30c8(&P):
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/breakpoints/Bundle_ja.properties
index 2d7b79f..68c5b40 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/breakpoints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 MSG_BRKP_Resolved=\u73fe\u5728\u306e\u884c\u3067\u6b63\u5e38\u306b\u89e3\u6c7a\u3055\u308c\u307e\u3057\u305f\u3002
 MSG_BRKP_Unresolved=\u73fe\u5728\u306e\u884c\u3067\u89e3\u6c7a\u3055\u308c\u3066\u3044\u306a\u3044\u304b\u3001\u975e\u30a2\u30af\u30c6\u30a3\u30d6\u3067\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/callstack/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/callstack/models/Bundle_ja.properties
index b467ab9..f8b5f67 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/callstack/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/callstack/models/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_DebuggerRunning=\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u5b9f\u884c\u3057\u3066\u3044\u307e\u3059...
 CTL_DebuggerRunningDescr=\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u5b9f\u884c\u4e2d\u30b9\u30bf\u30c3\u30af\u30fb\u30c8\u30ec\u30fc\u30b9\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 CTL_DebuggingActionsModel_Copy2CLBD_Label=\u30b9\u30bf\u30c3\u30af\u3092\u30b3\u30d4\u30fc
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/frames/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/frames/Bundle_ja.properties
index 5d0805e..d08e654 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/frames/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/frames/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_anonymousFunction=\u533f\u540d
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/resources/Bundle_ja.properties
index 597e6f5..3f23b9d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Menu/RunProject/Stack=\u30b9\u30bf\u30c3\u30af(&S)
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/vars/eval/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/vars/eval/Bundle_ja.properties
index a62832a..1c716af 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/vars/eval/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/vars/eval/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_EvaluatorHistoryNode=\u5c65\u6b74
 CTL_EvaluatorHistoryNodeDescr=\u8a55\u4fa1\u5c65\u6b74
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/vars/models/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/vars/models/Bundle_ja.properties
index 3ee9083..818b4e7 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/vars/models/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript-v8debug/javascript-v8debug/org/netbeans/modules/javascript/v8debug/vars/models/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - argument number
 CTL_Argument=\u5f15\u6570{0}
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-doc/javascript2-doc/org/netbeans/modules/javascript2/doc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-doc/javascript2-doc/org/netbeans/modules/javascript2/doc/Bundle_ja.properties
index 5db410d..e55e228 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-doc/javascript2-doc/org/netbeans/modules/javascript2/doc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-doc/javascript2-doc/org/netbeans/modules/javascript2/doc/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JavaScript2\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-doc/javascript2-doc/org/netbeans/modules/javascript2/doc/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-doc/javascript2-doc/org/netbeans/modules/javascript2/doc/api/Bundle_ja.properties
index a86dec7..130aea6 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-doc/javascript2-doc/org/netbeans/modules/javascript2/doc/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-doc/javascript2-doc/org/netbeans/modules/javascript2/doc/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JsDocumentationPrinter.title.deprecated=\u975e\u63a8\u5968
 JsDocumentationPrinter.title.description=\u8aac\u660e
 JsDocumentationPrinter.title.examples=\u4f8b
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_ja.properties
index e45254e..0eb84e2 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/Bundle_ja.properties
@@ -1,5 +1,19 @@
-
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 FT_Label_Array-block=\u914d\u5217
 FT_Label_Object-block=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
@@ -10,47 +24,6 @@
 LBL_ECMA5=ECMAScript 5.1
 LBL_ECMA6=ECMAScript 6
 LBL_ECMA7=ECMAScript 7 (\u8a66\u9a13\u6bb5\u968e)
-# 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-2009 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.
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript2\u30a8\u30c7\u30a3\u30bf
 OpenIDE-Module-Short-Description=JavaScript\u7de8\u96c6\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/actions/Bundle_ja.properties
index 1ced2e7..5242706 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 complete-line=\u884c\u3092\u5b8c\u4e86
 complete-line-newline=\u884c\u3092\u5b8c\u4e86\u3057\u3066\u65b0\u3057\u3044\u884c\u3092\u4f5c\u6210
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/Bundle_ja.properties
index ded79ab..647106c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SAMPLE_Default=function Foo () {var test = "test";this.other = "other";this.description = function () {formatter.println(other);}this.data = {diameter: 10,color: "black",print: function () {formatter.println("Diameter: "+ this.diameter);formatter.println("Color: "+ this.color);}}}
 LBL_bp_SAMELINE=\u540c\u3058\u884c
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_ja.properties
index 168d02d..4faeef9 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_TabsAndIndents=\u30bf\u30d6\u3068\u30a4\u30f3\u30c7\u30f3\u30c8
 FmtTabsIndents.AccessibleContext.accessibleName=\u30bf\u30d6\u3068\u30a4\u30f3\u30c7\u30f3\u30c8\u30fb\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/json/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/json/Bundle_ja.properties
index 4edb99c..c289c73 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/json/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/formatter/ui/json/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_TabsAndIndents=\u30bf\u30d6\u3068\u30a4\u30f3\u30c7\u30f3\u30c8
 FmtTabsIndents.AccessibleContext.accessibleName=\u30bf\u30d6\u3068\u30a4\u30f3\u30c7\u30f3\u30c8\u30fb\u30d5\u30a9\u30fc\u30e0
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/hints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/hints/Bundle_ja.properties
index 92d41f0..34e85c2 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/hints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/hints/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 AddGlobalJsHint_Description=\u5909\u6570{0}\u306eJsHint\u30b0\u30ed\u30fc\u30d0\u30eb\u30fb\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6\u3092\u751f\u6210\u3057\u307e\u3059
 ArrayTrailingCommaDescription=\u914d\u5217\u30ea\u30c6\u30e9\u30eb\u306e\u6700\u5f8c\u306e\u30a2\u30a4\u30c6\u30e0\u306e\u5f8c\u306b','\u304c\u3042\u308b\u5834\u5408\u306b\u8b66\u544a\u3057\u307e\u3059\u3002
 ArrayTrailingCommaDisplayName=\u914d\u5217\u30ea\u30c6\u30e9\u30eb\u5185\u306e\u672b\u5c3e\u306e\u30ab\u30f3\u30de
@@ -6,45 +23,6 @@
 AssignmentInConditionDisplayName=\u6761\u4ef6\u5185\u306e\u4ee3\u5165
 BetterConditionDescription=\u6761\u4ef6\u3067===\u307e\u305f\u306f!==\u3067\u306f\u306a\u304f==\u307e\u305f\u306f!=\u304c\u4f7f\u7528\u3055\u308c\u3066\u3044\u308b\u30b1\u30fc\u30b9\u3092\u30ec\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002
 BetterConditionDisplayName===\u307e\u305f\u306f!=\u3067\u306f\u306a\u304f===\u307e\u305f\u306f!==\u3092\u4f7f\u7528\u3057\u3066\u3044\u307e\u3059
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2012 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
 csl-hints/text/javascript/hints/convention=JS\u8868\u8a18\u898f\u5247
 csl-hints/text/javascript/hints/documentation=JS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
 csl-hints/text/javascript/hints/other=\u305d\u306e\u4ed6
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_ja.properties
index 977a9f8..877556b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CodeCompletionPanel.AccessibleContext.accessibleDescription=JavaScript\u30b3\u30fc\u30c9\u88dc\u5b8c\u69cb\u6210\u306e\u30d1\u30cd\u30eb\u3002
 CodeCompletionPanel.AccessibleContext.accessibleName=JavaScript\u30b3\u30fc\u30c9\u88dc\u5b8c\u69cb\u6210\u30d1\u30cd\u30eb
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/json/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/json/Bundle_ja.properties
index 9b1a82d..cbb7690 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/json/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/options/ui/json/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CodeCompletionPanel.AccessibleContext.accessibleDescription=JSON\u30b3\u30fc\u30c9\u88dc\u5b8c\u69cb\u6210\u306e\u30d1\u30cd\u30eb\u3002
 CodeCompletionPanel.AccessibleContext.accessibleName=JSON\u30b3\u30fc\u30c9\u88dc\u5b8c\u69cb\u6210\u30d1\u30cd\u30eb
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/parser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/parser/Bundle_ja.properties
index 69902ea..a257f2b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/parser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/parser/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - file name
 disableFilterForFile="{0}"\u3067\u306eJS\u30a8\u30e9\u30fc\u306e\u30d5\u30a3\u30eb\u30bf\u30ea\u30f3\u30b0\u306e\u7121\u52b9\u5316
 # {0} - file name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/Bundle_ja.properties
index f4f694b..c60b222 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Other/javascript.js=JavaScript\u30d5\u30a1\u30a4\u30eb
 Templates/Other/json.json=JSON\u30d5\u30a1\u30a4\u30eb
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/javascript_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/javascript_ja.html
index 5b1bb0f..ca238c4 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/javascript_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/javascript_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/json_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/json_ja.html
index 254154d..60732ed 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/json_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/resources/json_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/ui/Bundle_ja.properties
index e15997f..4fea8c5 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-editor/javascript2-editor/org/netbeans/modules/javascript2/editor/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-2009 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ECMAScriptPanel.lVersion.text=ECMA\u30d0\u30fc\u30b8\u30e7\u30f3(&V):
 ECMAScriptPanel.allowJsonComments.text=JSON\u30d5\u30a1\u30a4\u30eb\u3067\u30b3\u30e1\u30f3\u30c8\u3092\u8a31\u53ef(&A)
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-extdoc/javascript2-extdoc/org/netbeans/modules/javascript2/extdoc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-extdoc/javascript2-extdoc/org/netbeans/modules/javascript2/extdoc/Bundle_ja.properties
index d8fecbd..bf351fa 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-extdoc/javascript2-extdoc/org/netbeans/modules/javascript2/extdoc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-extdoc/javascript2-extdoc/org/netbeans/modules/javascript2/extdoc/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JavaScript2 ExtDoc
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-extjs/javascript2-extjs/org/netbeans/modules/javascript2/extjs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-extjs/javascript2-extjs/org/netbeans/modules/javascript2/extjs/Bundle_ja.properties
index 23559f9..21c6d60 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-extjs/javascript2-extjs/org/netbeans/modules/javascript2/extjs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-extjs/javascript2-extjs/org/netbeans/modules/javascript2/extjs/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ExtJsCompletionItem.lbl.extjs.framework=\u5916\u90e8JS
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=\u5916\u90e8Ext JS\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30a8\u30c7\u30a3\u30bf\u30fb\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Name=JavaScript2 ExtJS
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/Bundle_ja.properties
index 8f9f2fe..bdcafe6 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript Jade\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/editor/Bundle_ja.properties
index 0a0f9c5..ec60917 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/editor/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 JadeResolver=Jade\u30d5\u30a1\u30a4\u30eb
 LBL_JadeEditorTab=\u30bd\u30fc\u30b9(&S)
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/Bundle_ja.properties
index 97c84e1..80b503b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/ClientSide/jadeTemplate.jade=Jade\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/jadeTemplate_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/jadeTemplate_ja.html
index 2f4c0a3..e57d699 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/jadeTemplate_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jade/javascript2-jade/org/netbeans/modules/javascript2/jade/resources/jadeTemplate_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/Bundle_ja.properties
index 87bd6fa..54c7789 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript2 jQuery
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/editor/Bundle_ja.properties
index 7ecd459..6af8a23 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jquery/javascript2-jquery/org/netbeans/modules/javascript2/jquery/editor/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 JQueryCompletionItem.lbl.jquery=jQuery
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jsdoc/javascript2-jsdoc/org/netbeans/modules/javascript2/jsdoc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jsdoc/javascript2-jsdoc/org/netbeans/modules/javascript2/jsdoc/Bundle_ja.properties
index e73c20e..b53023b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-jsdoc/javascript2-jsdoc/org/netbeans/modules/javascript2/jsdoc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-jsdoc/javascript2-jsdoc/org/netbeans/modules/javascript2/jsdoc/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JavaScript2 JSDoc
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-json/javascript2-json/org/netbeans/modules/javascript2/json/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-json/javascript2-json/org/netbeans/modules/javascript2/json/Bundle_ja.properties
index 91ea274..74de805 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-json/javascript2-json/org/netbeans/modules/javascript2/json/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-json/javascript2-json/org/netbeans/modules/javascript2/json/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript2 Json
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-kit/javascript2-kit/org/netbeans/modules/javascript2/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-kit/javascript2-kit/org/netbeans/modules/javascript2/kit/Bundle_ja.properties
index 38a6db6..8599e64 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-kit/javascript2-kit/org/netbeans/modules/javascript2/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-kit/javascript2-kit/org/netbeans/modules/javascript2/kit/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript2\u30ad\u30c3\u30c8
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/Bundle_ja.properties
index bc1173d..0722795 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Name=JavaScript2 Knockout
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/model/Bundle_ja.properties
index 87b8cc4..84bec20 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-knockout/javascript2-knockout/org/netbeans/modules/javascript2/knockout/model/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 label_knockout=Knockout
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-lexer/javascript2-lexer/org/netbeans/modules/javascript2/lexer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-lexer/javascript2-lexer/org/netbeans/modules/javascript2/lexer/Bundle_ja.properties
index 58272ac..634d7a1 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-lexer/javascript2-lexer/org/netbeans/modules/javascript2/lexer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-lexer/javascript2-lexer/org/netbeans/modules/javascript2/lexer/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JavaScript2 Lexer
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-model/javascript2-model/org/netbeans/modules/javascript2/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-model/javascript2-model/org/netbeans/modules/javascript2/model/Bundle_ja.properties
index f933c1a..b7a3705 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-model/javascript2-model/org/netbeans/modules/javascript2/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-model/javascript2-model/org/netbeans/modules/javascript2/model/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JavaScript2\u30e2\u30c7\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-model/javascript2-model/org/netbeans/modules/javascript2/model/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-model/javascript2-model/org/netbeans/modules/javascript2/model/api/Bundle_ja.properties
index 80f168c..7877536 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-model/javascript2-model/org/netbeans/modules/javascript2/model/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-model/javascript2-model/org/netbeans/modules/javascript2/model/api/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_DefaultDocContentForURL=\u3053\u306e\u6a5f\u80fd\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u8868\u793a\u3059\u308b\u306b\u306f\u3001\u3053\u306e\u30c6\u30ad\u30b9\u30c8\u306e\u4e0a\u306b\u3042\u308b\u30c4\u30fc\u30eb\u30d0\u30fc\u306e\u30d6\u30e9\u30a6\u30b6\u30fb\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u307e\u3059\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/editor/Bundle_ja.properties
index d79255c..dc002ee 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/editor/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 doc.building=NodeJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 # {0} - the documentation URL
 doc.cannotGet="{0}"\u304b\u3089NodeJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/resources/Bundle_ja.properties
index 45fa852..dcfc693 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-nodejs/javascript2-nodejs/org/netbeans/modules/javascript2/nodejs/resources/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=Node.js\u306b\u5bfe\u3059\u308b\u30a8\u30c7\u30a3\u30bf\u30fb\u30b5\u30dd\u30fc\u30c8\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-prototypejs/javascript2-prototypejs/org/netbeans/modules/javascript2/prototypejs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-prototypejs/javascript2-prototypejs/org/netbeans/modules/javascript2/prototypejs/Bundle_ja.properties
index f94ed47..c7ed5de 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-prototypejs/javascript2-prototypejs/org/netbeans/modules/javascript2/prototypejs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-prototypejs/javascript2-prototypejs/org/netbeans/modules/javascript2/prototypejs/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=PrototypeJs\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30a8\u30c7\u30a3\u30bf\u30fb\u30b5\u30dd\u30fc\u30c8\u3002\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u8a73\u7d30\u306f\u3001http://prototypejs.org/\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 OpenIDE-Module-Name=JavaScript2 PrototypeJs
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/Bundle_ja.properties
index 7023d58..3d67931 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=JSX\u306f\u3001XML\u306b\u4f3c\u305fJavaScript\u69cb\u6587\u62e1\u5f35\u6a5f\u80fd\u3067\u3059\u3002React\u3067\u306f\u5358\u7d14\u306aJSX\u306e\u69cb\u6587\u5909\u63db\u3092\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
 OpenIDE-Module-Name=JavaScript2 JSX | React
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/resources/Bundle_ja.properties
index f2baafb..477337f 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Portions Copyrighted 2016 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Templates/Other/reactjs.jsx=React JSX\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/resources/reactjs_ja.html b/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/resources/reactjs_ja.html
index 34a5660..172fe6c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/resources/reactjs_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-react/javascript2-react/org/netbeans/modules/javascript2/react/resources/reactjs_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/Bundle_ja.properties
index 78d2b1e..f4a04a1 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/Bundle_ja.properties
@@ -1,44 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 doc.building=RequireJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u4e2d
 # {0} - the documentation URL
 doc.cannotGet="{0}"\u304b\u3089RequireJS\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3002
 doc.notFound=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Display-Category=JavaScript
 OpenIDE-Module-Long-Description=RequireJS\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u306e\u30a8\u30c7\u30a3\u30bf\u30fb\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Name=JavaScript2 RequiereJs
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/Bundle_ja.properties
index e7e1941..9c3712f 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 mappedFile=\u30d5\u30a1\u30a4\u30eb
 mappedFolder=\u30d5\u30a9\u30eb\u30c0
 mappedToVirtual=\u5b58\u5728\u3057\u306a\u3044\u30d5\u30a9\u30eb\u30c0/\u30d5\u30a1\u30a4\u30eb\u306b\u30de\u30c3\u30d7\u3055\u308c\u3066\u3044\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/model/Bundle_ja.properties
index 80f87be..f027979 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/editor/model/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 label_requirejs=RequireJS
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/ui/Bundle_ja.properties
index d6a0c2e..d21773f 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-requirejs/javascript2-requirejs/org/netbeans/modules/javascript2/requirejs/ui/Bundle_ja.properties
@@ -1,43 +1,19 @@
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 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]"
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2011 Sun Microsystems, Inc.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 RequireJsCustomizer.displayName=RequireJs
 # customizer panel
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-sdoc/javascript2-sdoc/org/netbeans/modules/javascript2/sdoc/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-sdoc/javascript2-sdoc/org/netbeans/modules/javascript2/sdoc/Bundle_ja.properties
index 541f6d1..1a856e1 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-sdoc/javascript2-sdoc/org/netbeans/modules/javascript2/sdoc/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-sdoc/javascript2-sdoc/org/netbeans/modules/javascript2/sdoc/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JavaScript2 ScriptDoc
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-source-query/javascript2-source-query/org/netbeans/modules/javascript2/source/query/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-source-query/javascript2-source-query/org/netbeans/modules/javascript2/source/query/Bundle_ja.properties
index 5aef047..c18b694 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-source-query/javascript2-source-query/org/netbeans/modules/javascript2/source/query/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-source-query/javascript2-source-query/org/netbeans/modules/javascript2/source/query/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-#
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Long-Description=JavaScript\u30c7\u30d0\u30c3\u30ac\u3067\u4f7f\u7528\u3055\u308c\u308b\u30bd\u30fc\u30b9\u8981\u7d20\u554f\u5408\u305b\u306e\u5b9f\u88c5\u3002
 OpenIDE-Module-Name=JavaScript\u30bd\u30fc\u30b9\u8981\u7d20\u554f\u5408\u305b
diff --git a/netbeans-l10n-zip/src/ja/webcommon/javascript2-types/javascript2-types/org/netbeans/modules/javascript2/types/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/javascript2-types/javascript2-types/org/netbeans/modules/javascript2/types/Bundle_ja.properties
index 64845ca..5f09de3 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/javascript2-types/javascript2-types/org/netbeans/modules/javascript2/types/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/javascript2-types/javascript2-types/org/netbeans/modules/javascript2/types/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JavaScript2\u30bf\u30a4\u30d7
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/Bundle_ja.properties
index 494fb30..dd68431 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ApacheConfResolver=Apache Conf\u30d5\u30a1\u30a4\u30eb
 Source=\u30bd\u30fc\u30b9(&S)
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/resources/ApacheConfFileDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/resources/ApacheConfFileDescription_ja.html
index 5e5cafb..4731447 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/resources/ApacheConfFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/resources/ApacheConfFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/resources/Bundle_ja.properties
index e905579..b900ac3 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/languages-apacheconf/languages-apacheconf/org/netbeans/modules/languages/apacheconf/resources/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u8a00\u8a9e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Long-Description=Apache Conf\u30d5\u30a1\u30a4\u30eb\u306e\u7de8\u96c6\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002
 OpenIDE-Module-Name=Apache Conf\u30d5\u30a1\u30a4\u30eb\u30fb\u30a8\u30c7\u30a3\u30bf\u306e\u30b5\u30dd\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/Bundle_ja.properties
index 3606f14..14f0b64 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 INIResolver=INI\u30d5\u30a1\u30a4\u30eb
 Source=\u30bd\u30fc\u30b9(&S)
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/resources/Bundle_ja.properties
index b9d42e3..118517c 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=\u8a00\u8a9e\u30b5\u30dd\u30fc\u30c8
 OpenIDE-Module-Long-Description=INI\u30d5\u30a1\u30a4\u30eb\u306e\u7de8\u96c6\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/resources/EmptyINIFileDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/resources/EmptyINIFileDescription_ja.html
index 30fe4aa..3d31f26 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/resources/EmptyINIFileDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/languages-ini/languages-ini/org/netbeans/modules/languages/ini/resources/EmptyINIFileDescription_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/netserver/netserver/org/netbeans/modules/netserver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/netserver/netserver/org/netbeans/modules/netserver/Bundle_ja.properties
index 94db7e4..e7d0032 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/netserver/netserver/org/netbeans/modules/netserver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/netserver/netserver/org/netbeans/modules/netserver/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=Web
 OpenIDE-Module-Long-Description=\u57cb\u8fbc\u307f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u5b9f\u88c5\u306e\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af\u3002
 OpenIDE-Module-Name=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u30fb\u30d5\u30ec\u30fc\u30e0\u30ef\u30fc\u30af
diff --git a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-api-knockout/org-netbeans-api-knockout/org/netbeans/spi/knockout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-api-knockout/org-netbeans-api-knockout/org/netbeans/spi/knockout/Bundle_ja.properties
index 1834b89..a22d03f 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-api-knockout/org-netbeans-api-knockout/org/netbeans/spi/knockout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-api-knockout/org-netbeans-api-knockout/org/netbeans/spi/knockout/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Knockout\u30e2\u30c7\u30eb\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0API
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-lib-v8debug/org-netbeans-lib-v8debug/org/netbeans/lib/v8debug/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-lib-v8debug/org-netbeans-lib-v8debug/org/netbeans/lib/v8debug/Bundle_ja.properties
index 5c0288b..dbcc60a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-lib-v8debug/org-netbeans-lib-v8debug/org/netbeans/lib/v8debug/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-lib-v8debug/org-netbeans-lib-v8debug/org/netbeans/lib/v8debug/Bundle_ja.properties
@@ -1,43 +1,20 @@
 # 
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 OpenIDE-Module-Name=V8\u30c7\u30d0\u30c3\u30b0\u30fb\u30d7\u30ed\u30c8\u30b3\u30eb\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-lib-v8debug/org-netbeans-lib-v8debug/org/netbeans/lib/v8debug/client/cmdline/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-lib-v8debug/org-netbeans-lib-v8debug/org/netbeans/lib/v8debug/client/cmdline/Bundle_ja.properties
index b4b5966..ed0f031 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-lib-v8debug/org-netbeans-lib-v8debug/org/netbeans/lib/v8debug/client/cmdline/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-lib-v8debug/org-netbeans-lib-v8debug/org/netbeans/lib/v8debug/client/cmdline/Bundle_ja.properties
@@ -1,43 +1,20 @@
 # 
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 MSG_Usage=2\u3064\u306e\u5f15\u6570\u3092\u4e88\u671f\u3057\u3066\u3044\u307e\u3059\u3002\n1) \u30b5\u30fc\u30d0\u30fc\u540d\n2) \u30b5\u30fc\u30d0\u30fc\u30fb\u30dd\u30fc\u30c8\u756a\u53f7\n\u30b5\u30fc\u30d0\u30fc\u540d\u3068\u30dd\u30fc\u30c8\u756a\u53f7\u306e\u524d\u306b\u6b21\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002\n-verbose  - print verbose output
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-commons_compress/org-netbeans-libs-commons_compress/org/netbeans/libs/commons_compress/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-commons_compress/org-netbeans-libs-commons_compress/org/netbeans/libs/commons_compress/Bundle_ja.properties
index 4ba58b4..7ab8e59 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-commons_compress/org-netbeans-libs-commons_compress/org/netbeans/libs/commons_compress/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-commons_compress/org-netbeans-libs-commons_compress/org/netbeans/libs/commons_compress/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Commons Comppress\u7d71\u5408
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-jstestdriver/org-netbeans-libs-jstestdriver/org/netbeans/libs/jstestdriver/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-jstestdriver/org-netbeans-libs-jstestdriver/org/netbeans/libs/jstestdriver/Bundle_ja.properties
index a4134bd..bc91cfb 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-jstestdriver/org-netbeans-libs-jstestdriver/org/netbeans/libs/jstestdriver/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-jstestdriver/org-netbeans-libs-jstestdriver/org/netbeans/libs/jstestdriver/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=js-test-driver\u30e9\u30c3\u30d1\u30fc
 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
 OpenIDE-Module-Short-Description=js-test-driver\u30e9\u30c3\u30d1\u30fc
diff --git a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-nashorn/org-netbeans-libs-nashorn/org/netbeans/libs/nashorn/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-nashorn/org-netbeans-libs-nashorn/org/netbeans/libs/nashorn/Bundle_ja.properties
index 99dde36..23a7701 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-nashorn/org-netbeans-libs-nashorn/org/netbeans/libs/nashorn/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-nashorn/org-netbeans-libs-nashorn/org/netbeans/libs/nashorn/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Nashorn\u7d71\u5408
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-plist/org-netbeans-libs-plist/org/netbeans/libs/plist/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-plist/org-netbeans-libs-plist/org/netbeans/libs/plist/Bundle_ja.properties
index 338fb63..2f90681 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-plist/org-netbeans-libs-plist/org/netbeans/libs/plist/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/org-netbeans-libs-plist/org-netbeans-libs-plist/org/netbeans/libs/plist/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30d9\u30fc\u30b9IDE
 OpenIDE-Module-Long-Description=\u63d0\u4f9b\u3055\u308c\u3066\u3044\u308bAPI\u306f\u3001Cocoa/NeXTSTEP API\u3092\u6a21\u5023\u3057\u3001NSDictionary\u3001NSData\u306a\u3069\u306e\u30af\u30e9\u30b9\u306e\u57fa\u672c\u6a5f\u80fd\u3078\u306e\u30a2\u30af\u30bb\u30b9\u3092\u8a31\u53ef\u3057\u307e\u3059\u3002
 #Do not translate
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/Bundle_ja.properties
index 955ddf7..b27e00e 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CustomizerMocha.chooser.config=mocha\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u5834\u6240\u306e\u9078\u629e
 CustomizerMocha.confirm.autodiscovered.info=Mocha\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u81ea\u52d5\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002\u300cOK\u300d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u78ba\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/preferences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/preferences/Bundle_ja.properties
index 67e7f6a..9fbe46e 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/preferences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/preferences/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - source
 ExternalExecutableValidator.validateFile.missing={0}\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u5834\u6240\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 # {0} - source
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/wizard/Bundle_ja.properties
index 3880b25..48e0c30 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/wizard/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project
 NO_SELENIUM_SUPPORT=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306b\u5bfe\u3059\u308bSelenium 2.0\u30b5\u30dd\u30fc\u30c8\u306f\u3042\u308a\u307e\u305b\u3093
 Selenium2_Template_Wizard_Title=Selenium 2.0\u30c6\u30b9\u30c8\u30fb\u30b1\u30fc\u30b9\u540d
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/wizard/SeleneseMochaTestWebclient_ja.html b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/wizard/SeleneseMochaTestWebclient_ja.html
index 6d2ee4b..753573a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/wizard/SeleneseMochaTestWebclient_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-mocha/selenium2-webclient-mocha/org/netbeans/modules/selenium2/webclient/mocha/wizard/SeleneseMochaTestWebclient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/Bundle_ja.properties
index db7a9ca..3e0005b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/Bundle_ja.properties
@@ -1,46 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CustomizerProtractor.chooser.protractor=Protractor\u30d5\u30a1\u30a4\u30eb\u306e\u9078\u629e
 CustomizerProtractor.chooser.userConfigurationFile=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb\u306e\u9078\u629e
 CustomizerProtractor.confirm.autodiscovered.info=Protractor\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb\u304c\u81ea\u52d5\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002\u300cOK\u300d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u78ba\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 CustomizerProtractor.protractor.dir.info=protractor\u306e\u30d5\u30eb\u30fb\u30d1\u30b9(\u901a\u5e38\u306fnode_modules/protractor/bin/protractor)\u3002
 CustomizerProtractor.user.configuration.file.info=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb\u306e\u30d5\u30eb\u30fb\u30d1\u30b9\u3002
 CustomizerProtractorPanel.displayName=Protractor
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Selenium 2 HTML/JS Protractor\u30b5\u30dd\u30fc\u30c8
 CustomizerProtractor.protractorDirLabel.text=Protractor(&P):
 CustomizerProtractor.protractorDirBrowseButton.text=\u53c2\u7167(&B)...
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/preferences/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/preferences/Bundle_ja.properties
index 0c2380d..e5efe78 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/preferences/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/preferences/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ProtractorPreferencesValidator.protractor.name=Protractor
 ProtractorPreferencesValidator.userConfigurationFile.name=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb
 # {0} - source
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/Bundle_ja.properties
index 7a72e36..fd88dd2 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NewProtractorConfWizardIterator.protractor.template.displayName=Protractor\u69cb\u6210\u30d5\u30a1\u30a4\u30eb
 # {0} - project
 NO_SELENIUM_SUPPORT=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306b\u5bfe\u3059\u308bSelenium 2.0\u30b5\u30dd\u30fc\u30c8\u306f\u3042\u308a\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/ProtractorConfDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/ProtractorConfDescription_ja.html
index d8843ce..9e3cd0d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/ProtractorConfDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/ProtractorConfDescription_ja.html
@@ -1,44 +1,23 @@
 <!DOCTYPE html>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2014 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/SeleneseJasmineTestWebclient_ja.html b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/SeleneseJasmineTestWebclient_ja.html
index ae77940..b13b9ee 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/SeleneseJasmineTestWebclient_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient-protractor/selenium2-webclient-protractor/org/netbeans/modules/selenium2/webclient/protractor/wizard/SeleneseJasmineTestWebclient_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/Bundle_ja.properties
index b45298c..5b278df 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - project
 NO_SELENIUM_TESTS_FOLDER=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8: {0}\u306b\u5bfe\u3057\u3066\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308bSelenium\u30c6\u30b9\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306f\u3042\u308a\u307e\u305b\u3093
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 OpenIDE-Module-Name=Selenium 2 HTML/JS\u30b5\u30dd\u30fc\u30c8
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/api/Bundle_ja.properties
index 80d3a95..76208f8 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/api/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 TestRunner.noName=<\u540d\u524d\u306a\u3057>
 TestRunner.output.full=\u5b8c\u5168\u306a\u51fa\u529b\u306f\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u3042\u308a\u307e\u3059\u3002
 # {0} - project name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/Bundle_ja.properties
index 3dd8b3e..bd23d17 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 JumpToCallStackAction.name=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5(&G)
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/actions/Bundle_ja.properties
index 2a5d2a4..a517332 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/actions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 RunSeleniumTestsAction.name=Selenium\u30c6\u30b9\u30c8\u306e\u5b9f\u884c
 SeleniumDebugTestFileAction.name=\u30c6\u30b9\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30d0\u30c3\u30b0
 SeleniumTestFileAction.name=\u30d5\u30a1\u30a4\u30eb\u306e\u30c6\u30b9\u30c8
diff --git a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/customizer/Bundle_ja.properties
index 727c9de..153be45 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/selenium2-webclient/selenium2-webclient/org/netbeans/modules/selenium2/webclient/ui/customizer/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2014 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]"
-
-# 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.
-
-# Contributor(s):
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 SelectProviderPanel.noneSelected=\u30d7\u30ed\u30d0\u30a4\u30c0\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 # select testing provider
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-kit/web-client-kit/org/netbeans/modules/web/client/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-client-kit/web-client-kit/org/netbeans/modules/web/client/kit/Bundle_ja.properties
index 2666871..0a3cca6 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-kit/web-client-kit/org/netbeans/modules/web/client/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-kit/web-client-kit/org/netbeans/modules/web/client/kit/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=HTML5\u30ad\u30c3\u30c8
 OpenIDE-Module-Display-Category=HTML5
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/Bundle_ja.properties
index f3dfd8c..723e729 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/Bundle_ja.properties
@@ -1,45 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AngularJSSample=AngularJS\u306e\u7aef\u672b\u30ab\u30bf\u30ed\u30b0\u30fb\u30c1\u30e5\u30fc\u30c8\u30ea\u30a2\u30eb
 BackboneHelloWorld=Backbone.js\u306eHello World\u30c1\u30e5\u30fc\u30c8\u30ea\u30a2\u30eb
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/AngularJSPhoneCat_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/AngularJSPhoneCat_ja.html
index 60723b0..1db32e5 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/AngularJSPhoneCat_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/AngularJSPhoneCat_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneHelloWorld_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneHelloWorld_ja.html
index 2a22188..e869c0a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneHelloWorld_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneHelloWorld_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneJQueryMobile_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneJQueryMobile_ja.html
index ed6c50c..96d3183 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneJQueryMobile_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneJQueryMobile_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneWineCellar_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneWineCellar_ja.html
index 0febafc..c1762df 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneWineCellar_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/BackboneWineCellar_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/EmberJSTrek_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/EmberJSTrek_ja.html
index 9740827..03b0231 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/EmberJSTrek_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/EmberJSTrek_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/KnockoutJSGameList_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/KnockoutJSGameList_ja.html
index 4a722bd..fa0c5c0 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/KnockoutJSGameList_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/KnockoutJSGameList_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <!DOCTYPE html>
 <html>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/ResponsiveRabbits_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/ResponsiveRabbits_ja.html
index e7197f9..c070a89 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/ResponsiveRabbits_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/resources/ResponsiveRabbits_ja.html
@@ -1,41 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
 -->
 <html>
 <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/wizard/iterator/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/wizard/iterator/Bundle_ja.properties
index 6025e71..33567bd 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/wizard/iterator/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/wizard/iterator/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_NameNLocation=\u540d\u524d\u3068\u5834\u6240
 OnlineSampleWizardIterator.applyingTemplate=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u9069\u7528\u4e2d...
 OnlineSampleWizardIterator.creatingProject=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u4e2d...
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/wizard/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/wizard/ui/Bundle_ja.properties
index 8e60cf9..ce4d4de 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/wizard/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-client-samples/web-client-samples/org/netbeans/modules/web/client/samples/wizard/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 OnlineSampleVisualPanel.error.location.invalid=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5834\u6240\u304c\u6709\u52b9\u306a\u30d1\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 OnlineSampleVisualPanel.error.location.notEmpty=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u3001\u7a7a\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 OnlineSampleVisualPanel.error.location.notWritable=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
@@ -6,45 +23,6 @@
 SiteTemplateWizard.error.preparing=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8"{0}"\u3092\u6e96\u5099\u3067\u304d\u307e\u305b\u3093(\u8a73\u7d30\u306f\u3001IDE\u30ed\u30b0\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044)\u3002
 # {0} - template name
 SiteTemplateWizard.template.preparing=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8"{0}"\u3092\u521d\u3081\u3066\u4f7f\u7528\u3059\u308b\u6e96\u5099\u3092\u3057\u3066\u3044\u307e\u3059...
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2012 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
 Templates/Project/Samples/HTML5=HTML5/JavaScript
 Templates/Project/Samples/HTML5/ResponsiveRabbits=Responsive Rabbits
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/Bundle_ja.properties
index d6c1763..1473836 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Web\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
 OpenIDE-Module-Name=HTML5\u30d7\u30ed\u30b8\u30a7\u30af\u30c8API/SPI
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/build/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/build/ui/Bundle_ja.properties
index 5687000..bb9a38a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/build/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/build/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CustomizerPanel.buildCheckBox.text=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30d3\u30eb\u30c9(&B):
 CustomizerPanel.cleanCheckBox.text=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u6d88\u53bb(&L):
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/network/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/network/Bundle_ja.properties
index 0da908d..1dad3c5 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/network/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/network/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 NetworkSupport.errorDialog.configureProxy=\u30d7\u30ed\u30ad\u30b7\u306e\u69cb\u6210...
 # {0} - failed URLs
 NetworkSupport.errorDialog.text=<html>\u6b21\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u51e6\u7406\u4e2d\u306b\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:<br><br>{0}<br><br>\u518d\u8a66\u884c\u3057\u307e\u3059\u304b\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/network/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/network/ui/Bundle_ja.properties
index 490799d..104ee60 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/network/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/network/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 NetworkErrorPanel.infoTextPane.text=<html>\n<head>\n\n</head>\n<body>\n<p style="margin-top: 0">\u6b21\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u51e6\u7406\u4e2d\u306b\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:<br><br>%FAILED_REQUESTS%<br><br>\u518d\u8a66\u884c\u3057\u307e\u3059\u304b\u3002</p>\n  </body>\n</html>\n
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/sites/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/sites/Bundle_ja.properties
index 5505e19..468ab18 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/sites/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/sites/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 SiteHelper.error.emptyZip=\u30b5\u30a4\u30c8\u30fb\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u542b\u3080ZIP\u30d5\u30a1\u30a4\u30eb\u304c\u7a7a\u3067\u3042\u308b\u304b\u3001\u305d\u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 # {0} - file name
 SiteHelper.progress.unzip=\u30d5\u30a1\u30a4\u30eb{0}\u3092\u89e3\u51cd\u3057\u3066\u3044\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/validation/Bundle_ja.properties
index df24647..5f60217 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/api/validation/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - directory name, e.g. Unit Tests directory
 FolderValidator.error.folder.invalid={0}\u306f\u6709\u52b9\u306a\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 FolderValidator.error.folder.prefix=\u30d5\u30a9\u30eb\u30c0
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/browser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/browser/Bundle_ja.properties
index 990430b..9c7d7c5 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/browser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/browser/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ActiveBrowserAction.customize=\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
 ActiveBrowserAction.missingProject=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u30d6\u30e9\u30a6\u30b6\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/build/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/build/ui/Bundle_ja.properties
index 4be9541..48c63f8 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/build/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/build/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # {0} - task name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/jstesting/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/jstesting/Bundle_ja.properties
index 74d6959..234ed17 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/jstesting/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/jstesting/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2013 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CompositeCategoryProviderImpl.testing.title=JavaScript\u30c6\u30b9\u30c8
 # testing customizer
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/remotefiles/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/remotefiles/Bundle_ja.properties
index cbb254d..29418c7 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/remotefiles/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/remotefiles/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 LBL_RemoteFiles=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_ja.properties
index c9a253e..f5059c0 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 JsLibs.name=JavaScript\u30e9\u30a4\u30d6\u30e9\u30ea
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/ui/options/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/ui/options/Bundle_ja.properties
index 1e17b04..d24767b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/ui/options/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject-api/web-clientproject-api/org/netbeans/modules/web/clientproject/ui/options/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CssPreprocessorsOptionsFactory.name=CSS\u30d7\u30ea\u30d7\u30ed\u30bb\u30c3\u30b5
 Html5.Options.name=HTML/JS
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/Bundle_ja.properties
index 7dc1fce..ae2ef86 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - project name
 ClientSideProject.chooser.tests.selenium.title=Selenium\u30c6\u30b9\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306e\u9078\u629e({0})
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/browser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/browser/Bundle_ja.properties
index 60bd8c3..1fc81dd 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/browser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/browser/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MAIN_FILE=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u5b9f\u884c\u3059\u308b\u305f\u3081\u306e\u958b\u59cb\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 WITH_NETBEANS_INTEGRATION=NetBeans Connector\u7d44\u8fbc\u307f\u306e{0}
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/createprojectapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/createprojectapi/Bundle_ja.properties
index 267a36c..33877cc 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/createprojectapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/createprojectapi/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CreateProjectUtils.nameLocation.displayName=\u540d\u524d\u3068\u5834\u6240
 CreateProjectUtils.tools.displayName=\u30c4\u30fc\u30eb
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/problems/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/problems/Bundle_ja.properties
index 434cdaf..e431372 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/problems/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/problems/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # {0} - src dir path
 ProjectPropertiesProblemProvider.invalidSiteRootDir.description=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea"{0}"\u306f\u5b58\u5728\u3057\u306a\u3044\u305f\u3081\u3001\u30b5\u30a4\u30c8\u30fb\u30eb\u30fc\u30c8\u306b\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002
 ProjectPropertiesProblemProvider.invalidSiteRootDir.title=\u7121\u52b9\u306a\u30b5\u30a4\u30c8\u30fb\u30eb\u30fc\u30c8
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/sites/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/sites/Bundle_ja.properties
index f563bb0..dfedb08 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/sites/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/sites/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/Bundle_ja.properties
index 2a18cc8..7b2e246 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - project directory
 ClientSideProjectNode.library.description={0}\u306b\u3042\u308bJavaScript\u30e9\u30a4\u30d6\u30e9\u30ea
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/action/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/action/Bundle_ja.properties
index 41b8914..d8d7401 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/action/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/action/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_CreateSiteTemplateAction=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3068\u3057\u3066\u4fdd\u5b58
 DebugProjectAction.name.long=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30c7\u30d0\u30c3\u30b0
 DebugProjectAction.name.short=\u30c7\u30d0\u30c3\u30b0
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/action/command/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/action/command/Bundle_ja.properties
index 8156c03..f9613e1 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/action/command/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/action/command/Bundle_ja.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BuildToolsCommand.buildTool.none=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u4f7f\u7528\u3055\u308c\u3066\u3044\u308b\u30d3\u30eb\u30c9\u30fb\u30c4\u30fc\u30eb(Grunt\u306a\u3069)\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/browser/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/browser/Bundle_ja.properties
index c98af20..041af0e 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/browser/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/browser/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 BrowserConfigurationPanel.jHighlightSelectionCheckBox.text=\u30d6\u30e9\u30a6\u30b6DOM\u3068\u30d6\u30e9\u30a6\u30b6\u30fb\u30da\u30a4\u30f3\u8981\u7d20\u306e\u5f37\u8abf\u8868\u793a\u3092\u540c\u671f
 BrowserConfigurationPanel.jAutoRefreshCheckBox.text=\u81ea\u52d5\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_ja.properties
index a75567e..43e067d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/customizer/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} - part of URL
 BrowserRunPanel.webRoot.example=<html>\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306eURL\u306fhttp://localhost:{0}\u306b\u306a\u308a\u307e\u3059
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/ExistingClientSideProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/ExistingClientSideProjectDescription_ja.html
index 987ec6a..808f3c3 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/ExistingClientSideProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/ExistingClientSideProjectDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/NewClientSideLibraryDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/NewClientSideLibraryDescription_ja.html
index fae2c40..674a3cd 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/NewClientSideLibraryDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/NewClientSideLibraryDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/NewClientSideProjectDescription_ja.html b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/NewClientSideProjectDescription_ja.html
index d277efd..36a7a23 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/NewClientSideProjectDescription_ja.html
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/resources/NewClientSideProjectDescription_ja.html
@@ -1,43 +1,22 @@
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-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.
-
-Contributor(s):
-
-Portions Copyrighted 2012 Sun Microsystems, Inc.
 -->
 <html>
     <head>
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/wizard/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/wizard/Bundle_ja.properties
index 7c462e4..9bdf12f 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/wizard/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/ui/wizard/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ClientSideProject.dialog.location.title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u5834\u6240\u3092\u9078\u629e
 ClientSideProject.error.location.alreadyProject=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30d5\u30a9\u30eb\u30c0\u306f\u3059\u3067\u306bNetBeans\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u3059(\u30e1\u30e2\u30ea\u30fc\u5185\u306b\u306e\u307f\u3042\u308b\u53ef\u80fd\u6027\u3042\u308a)\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/util/Bundle_ja.properties
index 7a5edab..6a86278 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/util/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # UI Logging - http://wiki.netbeans.org/UsageLoggingSpecification
 # when new HTML5 project is created
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/validation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/validation/Bundle_ja.properties
index 94ec935..f517a67 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/validation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-clientproject/web-clientproject/org/netbeans/modules/web/clientproject/validation/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ProjectFoldersValidator.error.noSourcesOrSiteRoot=\u30bd\u30fc\u30b9\u307e\u305f\u306f\u30b5\u30a4\u30c8\u30fb\u30eb\u30fc\u30c8\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 ProjectFoldersValidator.error.sourcesEqualsSiteRoot=\u30bd\u30fc\u30b9\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3068\u30b5\u30a4\u30c8\u30fb\u30eb\u30fc\u30c8\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u540c\u3058\u3067\u3059\u3002
 ProjectFoldersValidator.error.sourcesUnderneathSiteRoot=\u30bd\u30fc\u30b9\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f\u30b5\u30a4\u30c8\u30fb\u30eb\u30fc\u30c8\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4e0b\u306b\u3042\u308a\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/Bundle_ja.properties
index 2ffd7e5..c4c4958 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Web\u30da\u30fc\u30b8\u306e\u691c\u67fb
 OpenIDE-Module-Short-Description=Web\u30da\u30fc\u30b8\u306e\u691c\u67fb
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/actions/Bundle_ja.properties
index ff8ec21..884ef5d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenResourceAction.displayName=\u958b\u304f
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/ui/Bundle_ja.properties
index 00193fc..d24c68b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_CssStylesProviderImpl.selection.view.title=\u9078\u629e
 CTL_DomAction=\u30d6\u30e9\u30a6\u30b6DOM
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/Bundle_ja.properties
index ef7f383..0d1909b 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # {0} tag name, {1} selector
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/actions/Bundle_ja.properties
index 810285a..a0de9df 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GoToNodeSourceAction.displayName=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/knockout/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/knockout/Bundle_ja.properties
index 2b2680c..b488083 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/knockout/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/knockout/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_KnockoutAction=Knockout
 CTL_KnockoutTC=Knockout
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/knockout/unused/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/knockout/unused/Bundle_ja.properties
index 3d691ad..298ca00 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/knockout/unused/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/knockout/unused/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2015 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 GoToBindingSourceAction.name=\u30bd\u30fc\u30b9\u3078\u79fb\u52d5
 ShowInDOMAction.name=\u30d6\u30e9\u30a6\u30b6DOM\u3067\u8868\u793a
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/ui/Bundle_ja.properties
index 41c12c2..287e1ed 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-inspect/web-inspect/org/netbeans/modules/web/inspect/webkit/ui/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CSSStylesPanel.document=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
 CSSStylesPanel.selection=\u9078\u629e
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/Bundle_ja.properties
index d7ee554..3125b0d 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/Bundle_ja.properties
@@ -1,43 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-#
-#
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Web
 OpenIDE-Module-Long-Description=WebKit\u3067\u5b9f\u884c\u3055\u308c\u308bJavaScript\u306e\u30c7\u30d0\u30c3\u30ac\u3002
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/actions/Bundle_ja.properties
index a1e5ed3..fb7d6b5 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/actions/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
-#
-# Portions Copyrighted 2014 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 AddDOMBreakpoint=DOM\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u8ffd\u52a0
 CTL_BreakOnAttributesModif=\u5c5e\u6027\u306e\u5909\u66f4\u3067\u30d6\u30ec\u30fc\u30af
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/annotation/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/annotation/Bundle_ja.properties
index c47e2ce..23d1c7e 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/annotation/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/annotation/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CallStackAnnotationDesc=\u547c\u51fa\u3057\u30b9\u30bf\u30c3\u30af
 CurrentLineAnnotationDesc=\u73fe\u5728\u306e\u884c
 # {0} - variable name
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/breakpoints/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/breakpoints/Bundle_ja.properties
index 885f746..23fb290 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/breakpoints/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/breakpoints/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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-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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 CTL_APPEND_BP_Invalid=[\u7121\u52b9]
 # {0} - message describing why is the breakpoint invalid.
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/breakpoints/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/breakpoints/ui/Bundle_ja.properties
index 7b46608..0919d65 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/breakpoints/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/breakpoints/ui/Bundle_ja.properties
@@ -1,41 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 ACSD_Breakpoint_Customizer_Dialog=\u3053\u306e\u30d6\u30ec\u30fc\u30af\u30dd\u30a4\u30f3\u30c8\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u30ab\u30b9\u30bf\u30de\u30a4\u30ba\u3057\u307e\u3059
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 DOMBreakpointCustomizer.jLabel2.text=DOM\u30ce\u30fc\u30c9:
 DOMBreakpointCustomizer.onSubtreeModifCheckBox.text=\u30b5\u30d6\u30c4\u30ea\u30fc\u306e\u5909\u66f4
 DOMBreakpointCustomizer.onAttrModifCheckBox.text=\u5c5e\u6027\u306e\u5909\u66f4
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/callstack/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/callstack/Bundle_ja.properties
index 757762e..0c2cc9a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/callstack/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/callstack/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_CallstackAction_Copy2CLBD_Label=\u30b9\u30bf\u30c3\u30af\u3092\u30b3\u30d4\u30fc
 CTL_CallstackAction_MakeCurrent_Label=\u73fe\u5728\u306b\u8a2d\u5b9a
 CTL_CallstackAction_RestartFrame_Label=\u30d5\u30ec\u30fc\u30e0\u3092\u518d\u8d77\u52d5
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/eval/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/eval/ui/Bundle_ja.properties
index a62832a..1c716af 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/eval/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/eval/ui/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_EvaluatorHistoryNode=\u5c65\u6b74
 CTL_EvaluatorHistoryNodeDescr=\u8a55\u4fa1\u5c65\u6b74
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/locals/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/locals/Bundle_ja.properties
index 54df0f7..d1c2f5a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/locals/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/locals/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Scope_Catch=\u30ad\u30e3\u30c3\u30c1
 Scope_Closure=\u30af\u30ed\u30fc\u30b8\u30e3
 Scope_Global=\u30b0\u30ed\u30fc\u30d0\u30eb
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/sessions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/sessions/Bundle_ja.properties
index bf727f5..1ac9b62 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/sessions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-javascript-debugger/web-javascript-debugger/org/netbeans/modules/web/javascript/debugger/sessions/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 Session_paused=\u4e00\u6642\u4f11\u6b62
 Session_running=\u5b9f\u884c\u4e2d
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/Bundle_ja.properties
index ce6547f..f3bc56a 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=WebKit Tooling
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/console/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/console/Bundle_ja.properties
index 615f2e4..8e203e1 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/console/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/console/Bundle_ja.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 BrowserConsoleLoggerSessionClosed=\u30d6\u30e9\u30a6\u30b6\u3092\u4f7f\u7528\u3057\u305f\u30c7\u30d0\u30c3\u30b0\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u9589\u3058\u3089\u308c\u307e\u3057\u305f\u3002
 BrowserConsoleLoggerTitle=\u30d6\u30e9\u30a6\u30b6\u30fb\u30ed\u30b0
 
diff --git a/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/networkmonitor/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/networkmonitor/Bundle_ja.properties
index dd16183..dfb28c8 100755
--- a/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/networkmonitor/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/webcommon/web-webkit-tooling/web-webkit-tooling/org/netbeans/modules/web/webkit/tooling/networkmonitor/Bundle_ja.properties
@@ -1,43 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 CTL_NetworkMonitorTopComponent=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30e2\u30cb\u30bf\u30fc
 CTL_OpenNetworkMonitorAction=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30e2\u30cb\u30bf\u30fc
 HINT_NetworkMonitorTopComponent=\u3053\u308c\u306f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30e2\u30cb\u30bf\u30fc\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u3059
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 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]"
-#
-# 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.
-#
-# Contributor(s):
 NetworkMonitorTopComponent.jResponsePanel.TabConstraints.tabTitle=\u30ec\u30b9\u30dd\u30f3\u30b9
 NetworkMonitorTopComponent.jResponsePanel.TabConstraints.tabTitleFrames=\u30d5\u30ec\u30fc\u30e0
 NetworkMonitorTopComponent.jNoData.text=<HTML>\u306a\u3093\u3089\u304b\u306e\u51e6\u7406\u304c\u884c\u308f\u308c\u308b\u306e\u3092\u5f85\u6a5f\u3057\u3066\u3044\u307e\u3059\u3002\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30e2\u30cb\u30bf\u30fc\u306b\u306f\u6b21\u304c\u8868\u793a\u3055\u308c\u307e\u3059:<br> - REST Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30b3\u30fc\u30eb<br> - WebSocket\u901a\u4fe1<br> - \u5931\u6557\u3057\u305f\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30ea\u30af\u30a8\u30b9\u30c8
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-jaxwsmodelapi/websvc-jaxwsmodelapi/org/netbeans/modules/websvc/jaxwsmodelapi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-jaxwsmodelapi/websvc-jaxwsmodelapi/org/netbeans/modules/websvc/jaxwsmodelapi/Bundle_ja.properties
index 876d0fa..ac31f93 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-jaxwsmodelapi/websvc-jaxwsmodelapi/org/netbeans/modules/websvc/jaxwsmodelapi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-jaxwsmodelapi/websvc-jaxwsmodelapi/org/netbeans/modules/websvc/jaxwsmodelapi/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=JAX-WS\u30e2\u30c7\u30ebAPI
 
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/model/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/model/Bundle_ja.properties
index 11b4504..6770f49 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/model/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/model/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ErrorLoadingWadl={1}\u304b\u3089WADL\u30e2\u30c7\u30eb\u30fb\u30d5\u30a9\u30fc\u30e0\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/spi/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/spi/Bundle_ja.properties
index af04606..d3a94d9 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/spi/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/spi/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/util/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/util/Bundle_ja.properties
index 578e48f..21b9df5 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/util/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/util/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 MSG_ErrorLoadingJaxb=\u30d5\u30a1\u30a4\u30eb{1}\u304b\u3089{0}\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/Bundle_ja.properties
index 5ad9b31..b1809ca 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-api/websvc-saas-api/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 INVALID_URL=\u6307\u5b9a\u3055\u308c\u305fWSDL URL\u306f\u6709\u52b9\u306aURL\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
 
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-codegen/websvc-saas-codegen/org/netbeans/modules/websvc/saas/codegen/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-codegen/websvc-saas-codegen/org/netbeans/modules/websvc/saas/codegen/Bundle_ja.properties
index 6f2df5d..1ff6431 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-codegen/websvc-saas-codegen/org/netbeans/modules/websvc/saas/codegen/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-codegen/websvc-saas-codegen/org/netbeans/modules/websvc/saas/codegen/Bundle_ja.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-# 
-# 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.
-# 
-# Contributor(s):
-# 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=SaaS\u30b5\u30fc\u30d3\u30b9\u30fb\u30b3\u30fc\u30c9\u751f\u6210
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-codegen/websvc-saas-codegen/org/netbeans/modules/websvc/saas/codegen/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-codegen/websvc-saas-codegen/org/netbeans/modules/websvc/saas/codegen/ui/Bundle_ja.properties
index b7103d9..54b6b37 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-codegen/websvc-saas-codegen/org/netbeans/modules/websvc/saas/codegen/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-codegen/websvc-saas-codegen/org/netbeans/modules/websvc/saas/codegen/ui/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 LBL_CustomizeSaasService={0} SaaS\u30b5\u30fc\u30d3\u30b9\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-kit/websvc-saas-kit/org/netbeans/modules/websvc/saas/kit/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-kit/websvc-saas-kit/org/netbeans/modules/websvc/saas/kit/Bundle_ja.properties
index bdc49c2..5213e78 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-kit/websvc-saas-kit/org/netbeans/modules/websvc/saas/kit/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-kit/websvc-saas-kit/org/netbeans/modules/websvc/saas/kit/Bundle_ja.properties
@@ -1,40 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Display-Category=\u30b5\u30fc\u30d3\u30b9\u30fb\u30ec\u30b8\u30b9\u30c8\u30ea
 OpenIDE-Module-Name=\u30b5\u30fc\u30d3\u30b9\u30fb\u30ec\u30b8\u30b9\u30c8\u30ea
 OpenIDE-Module-Short-Description=Web\u4e0a\u306b\u516c\u958b\u3055\u308c\u3066\u3044\u308b\u3055\u307e\u3056\u307e\u306a\u30b5\u30fc\u30d3\u30b9\u3092\u5229\u7528\u3059\u308b\u305f\u3081\u306e\u30b5\u30dd\u30fc\u30c8\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-amazon/websvc-saas-services-amazon/org/netbeans/modules/websvc/saas/services/amazon/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-amazon/websvc-saas-services-amazon/org/netbeans/modules/websvc/saas/services/amazon/Bundle_ja.properties
index 1811e88..6f6f66a 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-amazon/websvc-saas-services-amazon/org/netbeans/modules/websvc/saas/services/amazon/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-amazon/websvc-saas-services-amazon/org/netbeans/modules/websvc/saas/services/amazon/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Amazon\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-delicious/websvc-saas-services-delicious/org/netbeans/modules/websvc/saas/services/delicious/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-delicious/websvc-saas-services-delicious/org/netbeans/modules/websvc/saas/services/delicious/Bundle_ja.properties
index 692e057..9046d5c 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-delicious/websvc-saas-services-delicious/org/netbeans/modules/websvc/saas/services/delicious/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-delicious/websvc-saas-services-delicious/org/netbeans/modules/websvc/saas/services/delicious/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Delicious\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-flickr/websvc-saas-services-flickr/org/netbeans/modules/websvc/saas/services/flickr/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-flickr/websvc-saas-services-flickr/org/netbeans/modules/websvc/saas/services/flickr/Bundle_ja.properties
index faa963b..6a505cc 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-flickr/websvc-saas-services-flickr/org/netbeans/modules/websvc/saas/services/flickr/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-flickr/websvc-saas-services-flickr/org/netbeans/modules/websvc/saas/services/flickr/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Flickr\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-google/websvc-saas-services-google/org/netbeans/modules/websvc/saas/services/google/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-google/websvc-saas-services-google/org/netbeans/modules/websvc/saas/services/google/Bundle_ja.properties
index 5446b34..37579ad 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-google/websvc-saas-services-google/org/netbeans/modules/websvc/saas/services/google/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-google/websvc-saas-services-google/org/netbeans/modules/websvc/saas/services/google/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Name=Google\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/Bundle_ja.properties
index e0e823a..0376962 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=StrikeIron\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/actions/Bundle_ja.properties
index da50619..0c90736 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 LBL_FindStrikeIronServices=StrikeIron\u30b5\u30fc\u30d3\u30b9\u3092\u691c\u7d22...
 
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/resources/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/resources/Bundle_ja.properties
index c2374f4..e201347 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/resources/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/resources/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Long-Description=RESTful Web\u30b5\u30fc\u30d3\u30b9\u30fb\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3068\u3057\u3066\u306eStrikeIron Web\u30b5\u30fc\u30d3\u30b9\u306e\u5ba3\u8a00
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/ui/Bundle_ja.properties
index 920029c..75af1ba 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-strikeiron/websvc-saas-services-strikeiron/org/netbeans/modules/websvc/saas/services/strikeiron/ui/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 
 # Sample ResourceBundle properties file
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-weatherbug/websvc-saas-services-weatherbug/org/netbeans/modules/websvc/saas/services/weatherbug/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-weatherbug/websvc-saas-services-weatherbug/org/netbeans/modules/websvc/saas/services/weatherbug/Bundle_ja.properties
index 743b364..1491d35 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-weatherbug/websvc-saas-services-weatherbug/org/netbeans/modules/websvc/saas/services/weatherbug/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-weatherbug/websvc-saas-services-weatherbug/org/netbeans/modules/websvc/saas/services/weatherbug/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=WeatherBug\u30b5\u30fc\u30d3\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-zillow/websvc-saas-services-zillow/org/netbeans/modules/websvc/saas/services/zillow/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-zillow/websvc-saas-services-zillow/org/netbeans/modules/websvc/saas/services/zillow/Bundle_ja.properties
index 96a0d09..4afd6fa 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-zillow/websvc-saas-services-zillow/org/netbeans/modules/websvc/saas/services/zillow/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-zillow/websvc-saas-services-zillow/org/netbeans/modules/websvc/saas/services/zillow/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 OpenIDE-Module-Name=Zillow\u30b5\u30fc\u30d3\u30b9
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-zvents/websvc-saas-services-zvents/org/netbeans/modules/websvc/saas/services/zvents/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-zvents/websvc-saas-services-zvents/org/netbeans/modules/websvc/saas/services/zvents/Bundle_ja.properties
index 367ccaf..719eab1 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-zvents/websvc-saas-services-zvents/org/netbeans/modules/websvc/saas/services/zvents/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-services-zvents/websvc-saas-services-zvents/org/netbeans/modules/websvc/saas/services/zvents/Bundle_ja.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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]"
-#
-# 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.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 OpenIDE-Module-Name=Zvents\u30b5\u30fc\u30d3\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/Bundle_ja.properties
index e6f5584..a053403 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 OpenIDE-Module-Display-Category=Web\u30b5\u30fc\u30d3\u30b9
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/actions/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/actions/Bundle_ja.properties
index 6f96006..10a66ec 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/actions/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/actions/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ## Resource bundle for package org.netbeans.modules.visualweb.websvcmgr.actions
 #Fri Mar 21 11:21:42 PST 2003
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/nodes/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/nodes/Bundle_ja.properties
index 99957a9..77942a8 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/nodes/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/nodes/Bundle_ja.properties
@@ -1,44 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 Web_Services=Web\u30b5\u30fc\u30d3\u30b9
 
diff --git a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/wizards/Bundle_ja.properties b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/wizards/Bundle_ja.properties
index 06cc326..dd8c6ac 100755
--- a/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/wizards/Bundle_ja.properties
+++ b/netbeans-l10n-zip/src/ja/websvccommon/websvc-saas-ui/websvc-saas-ui/org/netbeans/modules/websvc/saas/ui/wizards/Bundle_ja.properties
@@ -1,44 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Sample ResourceBundle properties file
 
 LBL_WsdlSource=Web\u30b5\u30fc\u30d3\u30b9(REST\u30ea\u30bd\u30fc\u30b9)\u30c7\u30a3\u30b9\u30af\u30ea\u30d7\u30bf\u30fb\u30d5\u30a1\u30a4\u30eb(WSDL\u307e\u305f\u306fWADL\u30d5\u30a1\u30a4\u30eb)\u3092\u6307\u5b9a(&S):